Move to Apollo v3
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
parent
7cb40bd9e2
commit
e96dcc42b9
@ -14,6 +14,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@absinthe/socket": "^0.2.1",
|
"@absinthe/socket": "^0.2.1",
|
||||||
"@absinthe/socket-apollo-link": "^0.2.1",
|
"@absinthe/socket-apollo-link": "^0.2.1",
|
||||||
|
"@apollo/client": "^3.3.16",
|
||||||
"@mdi/font": "^5.0.45",
|
"@mdi/font": "^5.0.45",
|
||||||
"@tiptap/core": "^2.0.0-beta.41",
|
"@tiptap/core": "^2.0.0-beta.41",
|
||||||
"@tiptap/extension-blockquote": "^2.0.0-beta.6",
|
"@tiptap/extension-blockquote": "^2.0.0-beta.6",
|
||||||
@ -29,14 +30,6 @@
|
|||||||
"@tiptap/starter-kit": "^2.0.0-beta.37",
|
"@tiptap/starter-kit": "^2.0.0-beta.37",
|
||||||
"@tiptap/vue-2": "^2.0.0-beta.21",
|
"@tiptap/vue-2": "^2.0.0-beta.21",
|
||||||
"apollo-absinthe-upload-link": "^1.5.0",
|
"apollo-absinthe-upload-link": "^1.5.0",
|
||||||
"apollo-cache": "^1.3.5",
|
|
||||||
"apollo-cache-inmemory": "^1.6.6",
|
|
||||||
"apollo-client": "^2.6.10",
|
|
||||||
"apollo-link": "^1.2.14",
|
|
||||||
"apollo-link-error": "^1.1.13",
|
|
||||||
"apollo-link-http": "^1.5.17",
|
|
||||||
"apollo-link-ws": "^1.0.19",
|
|
||||||
"apollo-utilities": "^1.3.2",
|
|
||||||
"buefy": "^0.9.0",
|
"buefy": "^0.9.0",
|
||||||
"bulma-divider": "^0.2.0",
|
"bulma-divider": "^0.2.0",
|
||||||
"core-js": "^3.6.4",
|
"core-js": "^3.6.4",
|
||||||
@ -96,7 +89,7 @@
|
|||||||
"eslint-plugin-vue": "^7.6.0",
|
"eslint-plugin-vue": "^7.6.0",
|
||||||
"flush-promises": "^1.0.2",
|
"flush-promises": "^1.0.2",
|
||||||
"jest-junit": "^12.0.0",
|
"jest-junit": "^12.0.0",
|
||||||
"mock-apollo-client": "^0.6",
|
"mock-apollo-client": "^1.1.0",
|
||||||
"prettier": "^2.2.1",
|
"prettier": "^2.2.1",
|
||||||
"prettier-eslint": "^12.0.0",
|
"prettier-eslint": "^12.0.0",
|
||||||
"sass": "^1.29.0",
|
"sass": "^1.29.0",
|
||||||
|
@ -1,12 +1,14 @@
|
|||||||
|
import { CURRENT_ACTOR_CLIENT } from "@/graphql/actor";
|
||||||
|
import { CURRENT_USER_CLIENT } from "@/graphql/user";
|
||||||
import { ICurrentUserRole } from "@/types/enums";
|
import { ICurrentUserRole } from "@/types/enums";
|
||||||
import { ApolloCache } from "apollo-cache";
|
import { ApolloCache, NormalizedCacheObject } from "@apollo/client/cache";
|
||||||
import { NormalizedCacheObject } from "apollo-cache-inmemory";
|
import { Resolvers } from "@apollo/client/core/types";
|
||||||
import { Resolvers } from "apollo-client/core/types";
|
|
||||||
|
|
||||||
export default function buildCurrentUserResolver(
|
export default function buildCurrentUserResolver(
|
||||||
cache: ApolloCache<NormalizedCacheObject>
|
cache: ApolloCache<NormalizedCacheObject>
|
||||||
): Resolvers {
|
): Resolvers {
|
||||||
cache.writeData({
|
cache.writeQuery({
|
||||||
|
query: CURRENT_USER_CLIENT,
|
||||||
data: {
|
data: {
|
||||||
currentUser: {
|
currentUser: {
|
||||||
__typename: "CurrentUser",
|
__typename: "CurrentUser",
|
||||||
@ -15,6 +17,12 @@ export default function buildCurrentUserResolver(
|
|||||||
isLoggedIn: false,
|
isLoggedIn: false,
|
||||||
role: ICurrentUserRole.USER,
|
role: ICurrentUserRole.USER,
|
||||||
},
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
cache.writeQuery({
|
||||||
|
query: CURRENT_ACTOR_CLIENT,
|
||||||
|
data: {
|
||||||
currentActor: {
|
currentActor: {
|
||||||
__typename: "CurrentActor",
|
__typename: "CurrentActor",
|
||||||
id: null,
|
id: null,
|
||||||
@ -47,7 +55,7 @@ export default function buildCurrentUserResolver(
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
localCache.writeData({ data });
|
localCache.writeQuery({ data, query: CURRENT_USER_CLIENT });
|
||||||
},
|
},
|
||||||
updateCurrentActor: (
|
updateCurrentActor: (
|
||||||
_: any,
|
_: any,
|
||||||
@ -74,7 +82,7 @@ export default function buildCurrentUserResolver(
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
localCache.writeData({ data });
|
localCache.writeQuery({ data, query: CURRENT_ACTOR_CLIENT });
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
@ -1,16 +1,76 @@
|
|||||||
import {
|
|
||||||
IntrospectionFragmentMatcher,
|
|
||||||
NormalizedCacheObject,
|
|
||||||
} from "apollo-cache-inmemory";
|
|
||||||
import { AUTH_ACCESS_TOKEN, AUTH_REFRESH_TOKEN } from "@/constants";
|
import { AUTH_ACCESS_TOKEN, AUTH_REFRESH_TOKEN } from "@/constants";
|
||||||
import { REFRESH_TOKEN } from "@/graphql/auth";
|
import { REFRESH_TOKEN } from "@/graphql/auth";
|
||||||
|
import { IFollower } from "@/types/actor/follower.model";
|
||||||
|
import { Paginate } from "@/types/paginate";
|
||||||
import { saveTokenData } from "@/utils/auth";
|
import { saveTokenData } from "@/utils/auth";
|
||||||
import { ApolloClient } from "apollo-client";
|
import {
|
||||||
|
ApolloClient,
|
||||||
|
FieldPolicy,
|
||||||
|
NormalizedCacheObject,
|
||||||
|
Reference,
|
||||||
|
TypePolicies,
|
||||||
|
} from "@apollo/client/core";
|
||||||
import introspectionQueryResultData from "../../fragmentTypes.json";
|
import introspectionQueryResultData from "../../fragmentTypes.json";
|
||||||
|
|
||||||
export const fragmentMatcher = new IntrospectionFragmentMatcher({
|
type possibleTypes = { name: string };
|
||||||
introspectionQueryResultData,
|
type schemaType = {
|
||||||
});
|
kind: string;
|
||||||
|
name: string;
|
||||||
|
possibleTypes: possibleTypes[];
|
||||||
|
};
|
||||||
|
|
||||||
|
// eslint-disable-next-line no-underscore-dangle
|
||||||
|
const types = introspectionQueryResultData.__schema.types as schemaType[];
|
||||||
|
export const possibleTypes = types.reduce((acc, type) => {
|
||||||
|
if (type.kind === "INTERFACE") {
|
||||||
|
acc[type.name] = type.possibleTypes.map(({ name }) => name);
|
||||||
|
}
|
||||||
|
return acc;
|
||||||
|
}, {} as Record<string, string[]>);
|
||||||
|
|
||||||
|
export const typePolicies: TypePolicies = {
|
||||||
|
Discussion: {
|
||||||
|
fields: {
|
||||||
|
comments: pageLimitPagination(),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Group: {
|
||||||
|
fields: {
|
||||||
|
organizedEvents: pageLimitPagination(["afterDatetime", "beforeDatetime"]),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Person: {
|
||||||
|
fields: {
|
||||||
|
organizedEvents: pageLimitPagination(),
|
||||||
|
participations: pageLimitPagination(["eventId"]),
|
||||||
|
memberships: pageLimitPagination(["group"]),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
RootQueryType: {
|
||||||
|
fields: {
|
||||||
|
relayFollowers: paginatedLimitPagination<IFollower>(),
|
||||||
|
relayFollowings: paginatedLimitPagination<IFollower>([
|
||||||
|
"orderBy",
|
||||||
|
"direction",
|
||||||
|
]),
|
||||||
|
events: pageLimitPagination(),
|
||||||
|
groups: pageLimitPagination([
|
||||||
|
"preferredUsername",
|
||||||
|
"name",
|
||||||
|
"domain",
|
||||||
|
"local",
|
||||||
|
"suspended",
|
||||||
|
]),
|
||||||
|
persons: pageLimitPagination([
|
||||||
|
"preferredUsername",
|
||||||
|
"name",
|
||||||
|
"domain",
|
||||||
|
"local",
|
||||||
|
"suspended",
|
||||||
|
]),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
export async function refreshAccessToken(
|
export async function refreshAccessToken(
|
||||||
apolloClient: ApolloClient<NormalizedCacheObject>
|
apolloClient: ApolloClient<NormalizedCacheObject>
|
||||||
@ -37,3 +97,71 @@ export async function refreshAccessToken(
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type KeyArgs = FieldPolicy<any>["keyArgs"];
|
||||||
|
|
||||||
|
export function pageLimitPagination<T = Reference>(
|
||||||
|
keyArgs: KeyArgs = false
|
||||||
|
): FieldPolicy<T[]> {
|
||||||
|
console.log("pageLimitPagination");
|
||||||
|
return {
|
||||||
|
keyArgs,
|
||||||
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||||
|
// @ts-ignore
|
||||||
|
merge(existing, incoming, { args }) {
|
||||||
|
console.log("existing", existing);
|
||||||
|
console.log("incoming", incoming);
|
||||||
|
// console.log("args", args);
|
||||||
|
if (!incoming) return existing;
|
||||||
|
if (!existing) return incoming; // existing will be empty the first time
|
||||||
|
|
||||||
|
return doMerge(existing as Array<T>, incoming as Array<T>, args);
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function paginatedLimitPagination<T = Paginate<any>>(
|
||||||
|
keyArgs: KeyArgs = false
|
||||||
|
): FieldPolicy<Paginate<T>> {
|
||||||
|
console.log("paginatedLimitPagination");
|
||||||
|
return {
|
||||||
|
keyArgs,
|
||||||
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||||
|
// @ts-ignore
|
||||||
|
merge(existing, incoming, { args }) {
|
||||||
|
if (!incoming) return existing;
|
||||||
|
if (!existing) return incoming; // existing will be empty the first time
|
||||||
|
|
||||||
|
return {
|
||||||
|
total: incoming.total,
|
||||||
|
elements: doMerge(existing.elements, incoming.elements, args),
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function doMerge<T = any>(
|
||||||
|
existing: Array<T>,
|
||||||
|
incoming: Array<T>,
|
||||||
|
args: Record<string, any> | null
|
||||||
|
): Array<T> {
|
||||||
|
const merged = existing ? existing.slice(0) : [];
|
||||||
|
let res;
|
||||||
|
if (args) {
|
||||||
|
// Assume an page of 1 if args.page omitted.
|
||||||
|
const { page = 1, limit = 10 } = args;
|
||||||
|
console.log("args, selected", { page, limit });
|
||||||
|
for (let i = 0; i < incoming.length; ++i) {
|
||||||
|
merged[(page - 1) * limit + i] = incoming[i];
|
||||||
|
}
|
||||||
|
res = merged;
|
||||||
|
} else {
|
||||||
|
// It's unusual (probably a mistake) for a paginated field not
|
||||||
|
// to receive any arguments, so you might prefer to throw an
|
||||||
|
// exception here, instead of recovering by appending incoming
|
||||||
|
// onto the existing array.
|
||||||
|
res = [...merged, ...incoming];
|
||||||
|
}
|
||||||
|
console.log("doMerge returns", res);
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
@ -10,8 +10,13 @@
|
|||||||
:show-detail-icon="false"
|
:show-detail-icon="false"
|
||||||
paginated
|
paginated
|
||||||
backend-pagination
|
backend-pagination
|
||||||
|
:current-page.sync="page"
|
||||||
|
:aria-next-label="$t('Next page')"
|
||||||
|
:aria-previous-label="$t('Previous page')"
|
||||||
|
:aria-page-label="$t('Page')"
|
||||||
|
:aria-current-label="$t('Current page')"
|
||||||
:total="relayFollowers.total"
|
:total="relayFollowers.total"
|
||||||
:per-page="perPage"
|
:per-page="FOLLOWERS_PER_PAGE"
|
||||||
@page-change="onFollowersPageChange"
|
@page-change="onFollowersPageChange"
|
||||||
checkable
|
checkable
|
||||||
checkbox-position="left"
|
checkbox-position="left"
|
||||||
@ -123,14 +128,33 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Mixins } from "vue-property-decorator";
|
import { Component, Mixins, Ref } from "vue-property-decorator";
|
||||||
import { SnackbarProgrammatic as Snackbar } from "buefy";
|
import { SnackbarProgrammatic as Snackbar } from "buefy";
|
||||||
import { formatDistanceToNow } from "date-fns";
|
import { formatDistanceToNow } from "date-fns";
|
||||||
import { ACCEPT_RELAY, REJECT_RELAY } from "../../graphql/admin";
|
import {
|
||||||
|
ACCEPT_RELAY,
|
||||||
|
REJECT_RELAY,
|
||||||
|
RELAY_FOLLOWERS,
|
||||||
|
} from "../../graphql/admin";
|
||||||
import { IFollower } from "../../types/actor/follower.model";
|
import { IFollower } from "../../types/actor/follower.model";
|
||||||
import RelayMixin from "../../mixins/relay";
|
import RelayMixin from "../../mixins/relay";
|
||||||
|
import RouteName from "@/router/name";
|
||||||
|
import { Paginate } from "@/types/paginate";
|
||||||
|
|
||||||
|
const FOLLOWERS_PER_PAGE = 10;
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
apollo: {
|
||||||
|
relayFollowers: {
|
||||||
|
query: RELAY_FOLLOWERS,
|
||||||
|
variables() {
|
||||||
|
return {
|
||||||
|
page: this.page,
|
||||||
|
limit: FOLLOWERS_PER_PAGE,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
metaInfo() {
|
metaInfo() {
|
||||||
return {
|
return {
|
||||||
title: this.$t("Followers") as string,
|
title: this.$t("Followers") as string,
|
||||||
@ -143,14 +167,36 @@ export default class Followers extends Mixins(RelayMixin) {
|
|||||||
|
|
||||||
formatDistanceToNow = formatDistanceToNow;
|
formatDistanceToNow = formatDistanceToNow;
|
||||||
|
|
||||||
async acceptRelays(): Promise<void> {
|
relayFollowers: Paginate<IFollower> = { elements: [], total: 0 };
|
||||||
await this.checkedRows.forEach((row: IFollower) => {
|
|
||||||
|
checkedRows: IFollower[] = [];
|
||||||
|
|
||||||
|
FOLLOWERS_PER_PAGE = FOLLOWERS_PER_PAGE;
|
||||||
|
|
||||||
|
@Ref("table") readonly table!: any;
|
||||||
|
|
||||||
|
toggle(row: Record<string, unknown>): void {
|
||||||
|
this.table.toggleDetails(row);
|
||||||
|
}
|
||||||
|
|
||||||
|
get page(): number {
|
||||||
|
return parseInt((this.$route.query.page as string) || "1", 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
set page(page: number) {
|
||||||
|
this.pushRouter(RouteName.RELAY_FOLLOWERS, {
|
||||||
|
page: page.toString(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
acceptRelays(): void {
|
||||||
|
this.checkedRows.forEach((row: IFollower) => {
|
||||||
this.acceptRelay(`${row.actor.preferredUsername}@${row.actor.domain}`);
|
this.acceptRelay(`${row.actor.preferredUsername}@${row.actor.domain}`);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async rejectRelays(): Promise<void> {
|
rejectRelays(): void {
|
||||||
await this.checkedRows.forEach((row: IFollower) => {
|
this.checkedRows.forEach((row: IFollower) => {
|
||||||
this.rejectRelay(`${row.actor.preferredUsername}@${row.actor.domain}`);
|
this.rejectRelay(`${row.actor.preferredUsername}@${row.actor.domain}`);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -196,5 +242,19 @@ export default class Followers extends Mixins(RelayMixin) {
|
|||||||
get checkedRowsHaveAtLeastOneToApprove(): boolean {
|
get checkedRowsHaveAtLeastOneToApprove(): boolean {
|
||||||
return this.checkedRows.some((checkedRow) => !checkedRow.approved);
|
return this.checkedRows.some((checkedRow) => !checkedRow.approved);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async onFollowersPageChange(page: number): Promise<void> {
|
||||||
|
this.page = page;
|
||||||
|
try {
|
||||||
|
await this.$apollo.queries.relayFollowers.fetchMore({
|
||||||
|
variables: {
|
||||||
|
page: this.page,
|
||||||
|
limit: FOLLOWERS_PER_PAGE,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
@ -32,8 +32,13 @@
|
|||||||
:show-detail-icon="false"
|
:show-detail-icon="false"
|
||||||
paginated
|
paginated
|
||||||
backend-pagination
|
backend-pagination
|
||||||
|
:current-page.sync="page"
|
||||||
|
:aria-next-label="$t('Next page')"
|
||||||
|
:aria-previous-label="$t('Previous page')"
|
||||||
|
:aria-page-label="$t('Page')"
|
||||||
|
:aria-current-label="$t('Current page')"
|
||||||
:total="relayFollowings.total"
|
:total="relayFollowings.total"
|
||||||
:per-page="perPage"
|
:per-page="FOLLOWINGS_PER_PAGE"
|
||||||
@page-change="onFollowingsPageChange"
|
@page-change="onFollowingsPageChange"
|
||||||
checkable
|
checkable
|
||||||
checkbox-position="left"
|
checkbox-position="left"
|
||||||
@ -127,7 +132,7 @@
|
|||||||
</b-button>
|
</b-button>
|
||||||
</template>
|
</template>
|
||||||
</b-table>
|
</b-table>
|
||||||
<b-message type="is-danger" v-if="relayFollowings.elements.length === 0">{{
|
<b-message type="is-danger" v-if="relayFollowings.total === 0">{{
|
||||||
$t("You don't follow any instances yet.")
|
$t("You don't follow any instances yet.")
|
||||||
}}</b-message>
|
}}</b-message>
|
||||||
</div>
|
</div>
|
||||||
@ -139,8 +144,31 @@ import { formatDistanceToNow } from "date-fns";
|
|||||||
import { ADD_RELAY, REMOVE_RELAY } from "../../graphql/admin";
|
import { ADD_RELAY, REMOVE_RELAY } from "../../graphql/admin";
|
||||||
import { IFollower } from "../../types/actor/follower.model";
|
import { IFollower } from "../../types/actor/follower.model";
|
||||||
import RelayMixin from "../../mixins/relay";
|
import RelayMixin from "../../mixins/relay";
|
||||||
|
import { RELAY_FOLLOWINGS } from "@/graphql/admin";
|
||||||
|
import { Paginate } from "@/types/paginate";
|
||||||
|
import RouteName from "@/router/name";
|
||||||
|
import {
|
||||||
|
ApolloCache,
|
||||||
|
FetchResult,
|
||||||
|
InMemoryCache,
|
||||||
|
Reference,
|
||||||
|
} from "@apollo/client/core";
|
||||||
|
import gql from "graphql-tag";
|
||||||
|
|
||||||
|
const FOLLOWINGS_PER_PAGE = 10;
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
apollo: {
|
||||||
|
relayFollowings: {
|
||||||
|
query: RELAY_FOLLOWINGS,
|
||||||
|
variables() {
|
||||||
|
return {
|
||||||
|
page: this.page,
|
||||||
|
limit: FOLLOWINGS_PER_PAGE,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
metaInfo() {
|
metaInfo() {
|
||||||
return {
|
return {
|
||||||
title: this.$t("Followings") as string,
|
title: this.$t("Followings") as string,
|
||||||
@ -155,16 +183,78 @@ export default class Followings extends Mixins(RelayMixin) {
|
|||||||
|
|
||||||
formatDistanceToNow = formatDistanceToNow;
|
formatDistanceToNow = formatDistanceToNow;
|
||||||
|
|
||||||
|
relayFollowings: Paginate<IFollower> = { elements: [], total: 0 };
|
||||||
|
|
||||||
|
FOLLOWINGS_PER_PAGE = FOLLOWINGS_PER_PAGE;
|
||||||
|
|
||||||
|
checkedRows: IFollower[] = [];
|
||||||
|
|
||||||
|
get page(): number {
|
||||||
|
return parseInt((this.$route.query.page as string) || "1", 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
set page(page: number) {
|
||||||
|
this.pushRouter(RouteName.RELAY_FOLLOWINGS, {
|
||||||
|
page: page.toString(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async onFollowingsPageChange(page: number): Promise<void> {
|
||||||
|
this.page = page;
|
||||||
|
try {
|
||||||
|
await this.$apollo.queries.relayFollowings.fetchMore({
|
||||||
|
variables: {
|
||||||
|
page: this.page,
|
||||||
|
limit: FOLLOWINGS_PER_PAGE,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async followRelay(e: Event): Promise<void> {
|
async followRelay(e: Event): Promise<void> {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
try {
|
try {
|
||||||
await this.$apollo.mutate({
|
await this.$apollo.mutate<{ relayFollowings: Paginate<IFollower> }>({
|
||||||
mutation: ADD_RELAY,
|
mutation: ADD_RELAY,
|
||||||
variables: {
|
variables: {
|
||||||
address: this.newRelayAddress.trim(), // trim to fix copy and paste domain name spaces and tabs
|
address: this.newRelayAddress.trim(), // trim to fix copy and paste domain name spaces and tabs
|
||||||
},
|
},
|
||||||
|
update(cache: ApolloCache<InMemoryCache>, { data }: FetchResult) {
|
||||||
|
cache.modify({
|
||||||
|
fields: {
|
||||||
|
relayFollowings(
|
||||||
|
existingFollowings = { elements: [], total: 0 },
|
||||||
|
{ readField }
|
||||||
|
) {
|
||||||
|
const newFollowingRef = cache.writeFragment({
|
||||||
|
id: `${data?.addRelay.__typename}:${data?.addRelay.id}`,
|
||||||
|
data: data?.addRelay,
|
||||||
|
fragment: gql`
|
||||||
|
fragment NewFollowing on Follower {
|
||||||
|
id
|
||||||
|
}
|
||||||
|
`,
|
||||||
|
});
|
||||||
|
if (
|
||||||
|
existingFollowings.elements.some(
|
||||||
|
(ref: Reference) =>
|
||||||
|
readField("id", ref) === data?.addRelay.id
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
return existingFollowings;
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
total: existingFollowings.total + 1,
|
||||||
|
elements: [newFollowingRef, ...existingFollowings.elements],
|
||||||
|
};
|
||||||
|
},
|
||||||
|
},
|
||||||
|
broadcast: false,
|
||||||
|
});
|
||||||
|
},
|
||||||
});
|
});
|
||||||
await this.$apollo.queries.relayFollowings.refetch();
|
|
||||||
this.newRelayAddress = "";
|
this.newRelayAddress = "";
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
Snackbar.open({
|
Snackbar.open({
|
||||||
@ -175,21 +265,35 @@ export default class Followings extends Mixins(RelayMixin) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async removeRelays(): Promise<void> {
|
removeRelays(): void {
|
||||||
await this.checkedRows.forEach((row: IFollower) => {
|
this.checkedRows.forEach((row: IFollower) => {
|
||||||
this.removeRelay(
|
this.removeRelay(row);
|
||||||
`${row.targetActor.preferredUsername}@${row.targetActor.domain}`
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async removeRelay(address: string): Promise<void> {
|
async removeRelay(follower: IFollower): Promise<void> {
|
||||||
|
const address = `${follower.targetActor.preferredUsername}@${follower.targetActor.domain}`;
|
||||||
try {
|
try {
|
||||||
await this.$apollo.mutate({
|
await this.$apollo.mutate({
|
||||||
mutation: REMOVE_RELAY,
|
mutation: REMOVE_RELAY,
|
||||||
variables: {
|
variables: {
|
||||||
address,
|
address,
|
||||||
},
|
},
|
||||||
|
update(cache: ApolloCache<InMemoryCache>) {
|
||||||
|
cache.modify({
|
||||||
|
fields: {
|
||||||
|
relayFollowings(existingFollowingRefs, { readField }) {
|
||||||
|
return {
|
||||||
|
total: existingFollowingRefs.total - 1,
|
||||||
|
elements: existingFollowingRefs.elements.filter(
|
||||||
|
(followingRef: Reference) =>
|
||||||
|
follower.id !== readField("id", followingRef)
|
||||||
|
),
|
||||||
|
};
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
},
|
||||||
});
|
});
|
||||||
await this.$apollo.queries.relayFollowings.refetch();
|
await this.$apollo.queries.relayFollowings.refetch();
|
||||||
this.checkedRows = [];
|
this.checkedRows = [];
|
||||||
|
@ -279,7 +279,7 @@ export default class Comment extends Vue {
|
|||||||
const { event } = eventData;
|
const { event } = eventData;
|
||||||
const { comments } = event;
|
const { comments } = event;
|
||||||
const parentCommentIndex = comments.findIndex(
|
const parentCommentIndex = comments.findIndex(
|
||||||
(oldComment) => oldComment.id === parentId
|
(oldComment: IComment) => oldComment.id === parentId
|
||||||
);
|
);
|
||||||
const parentComment = comments[parentCommentIndex];
|
const parentComment = comments[parentCommentIndex];
|
||||||
if (!parentComment) return;
|
if (!parentComment) return;
|
||||||
|
@ -88,6 +88,7 @@ import {
|
|||||||
import { CURRENT_ACTOR_CLIENT } from "../../graphql/actor";
|
import { CURRENT_ACTOR_CLIENT } from "../../graphql/actor";
|
||||||
import { IPerson } from "../../types/actor";
|
import { IPerson } from "../../types/actor";
|
||||||
import { IEvent } from "../../types/event.model";
|
import { IEvent } from "../../types/event.model";
|
||||||
|
import { ApolloCache, FetchResult, InMemoryCache } from "@apollo/client/core";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
apollo: {
|
apollo: {
|
||||||
@ -157,7 +158,7 @@ export default class CommentTree extends Vue {
|
|||||||
? comment.inReplyToComment.id
|
? comment.inReplyToComment.id
|
||||||
: null,
|
: null,
|
||||||
},
|
},
|
||||||
update: (store, { data }) => {
|
update: (store: ApolloCache<InMemoryCache>, { data }: FetchResult) => {
|
||||||
if (data == null) return;
|
if (data == null) return;
|
||||||
const newComment = data.createComment;
|
const newComment = data.createComment;
|
||||||
|
|
||||||
@ -249,7 +250,7 @@ export default class CommentTree extends Vue {
|
|||||||
variables: {
|
variables: {
|
||||||
commentId: comment.id,
|
commentId: comment.id,
|
||||||
},
|
},
|
||||||
update: (store, { data }) => {
|
update: (store: ApolloCache<InMemoryCache>, { data }: FetchResult) => {
|
||||||
if (data == null) return;
|
if (data == null) return;
|
||||||
const deletedCommentId = data.deleteComment.id;
|
const deletedCommentId = data.deleteComment.id;
|
||||||
|
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
import { UPLOAD_MEDIA } from "@/graphql/upload";
|
import { UPLOAD_MEDIA } from "@/graphql/upload";
|
||||||
import apolloProvider from "@/vue-apollo";
|
import apolloProvider from "@/vue-apollo";
|
||||||
import ApolloClient from "apollo-client";
|
import { ApolloClient } from "@apollo/client/core/ApolloClient";
|
||||||
import { NormalizedCacheObject } from "apollo-cache-inmemory";
|
|
||||||
import { Plugin } from "prosemirror-state";
|
import { Plugin } from "prosemirror-state";
|
||||||
import { EditorView } from "prosemirror-view";
|
import { EditorView } from "prosemirror-view";
|
||||||
import Image from "@tiptap/extension-image";
|
import Image from "@tiptap/extension-image";
|
||||||
|
import { NormalizedCacheObject } from "@apollo/client/cache";
|
||||||
|
|
||||||
/* eslint-disable class-methods-use-this */
|
/* eslint-disable class-methods-use-this */
|
||||||
|
|
||||||
|
@ -2,11 +2,11 @@ import { SEARCH_PERSONS } from "@/graphql/search";
|
|||||||
import { VueRenderer } from "@tiptap/vue-2";
|
import { VueRenderer } from "@tiptap/vue-2";
|
||||||
import tippy from "tippy.js";
|
import tippy from "tippy.js";
|
||||||
import MentionList from "./MentionList.vue";
|
import MentionList from "./MentionList.vue";
|
||||||
import ApolloClient from "apollo-client";
|
import { ApolloClient } from "@apollo/client/core/ApolloClient";
|
||||||
import { NormalizedCacheObject } from "apollo-cache-inmemory";
|
|
||||||
import apolloProvider from "@/vue-apollo";
|
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";
|
||||||
|
import { NormalizedCacheObject } from "@apollo/client/cache/inmemory/types";
|
||||||
|
|
||||||
const client =
|
const client =
|
||||||
apolloProvider.defaultClient as ApolloClient<NormalizedCacheObject>;
|
apolloProvider.defaultClient as ApolloClient<NormalizedCacheObject>;
|
||||||
|
@ -234,7 +234,9 @@ export default class NavBar extends Vue {
|
|||||||
query: IDENTITIES,
|
query: IDENTITIES,
|
||||||
});
|
});
|
||||||
if (data) {
|
if (data) {
|
||||||
this.identities = data.identities.map((identity) => new Person(identity));
|
this.identities = data.identities.map(
|
||||||
|
(identity: IPerson) => new Person(identity)
|
||||||
|
);
|
||||||
|
|
||||||
// If we don't have any identities, the user has validated their account,
|
// If we don't have any identities, the user has validated their account,
|
||||||
// is logging for the first time but didn't create an identity somehow
|
// is logging for the first time but didn't create an identity somehow
|
||||||
|
@ -134,6 +134,7 @@ import { addLocalUnconfirmedAnonymousParticipation } from "@/services/AnonymousP
|
|||||||
import { EventJoinOptions, ParticipantRole } from "@/types/enums";
|
import { EventJoinOptions, ParticipantRole } from "@/types/enums";
|
||||||
import RouteName from "@/router/name";
|
import RouteName from "@/router/name";
|
||||||
import { IParticipant } from "../../types/participant.model";
|
import { IParticipant } from "../../types/participant.model";
|
||||||
|
import { ApolloCache, FetchResult, InMemoryCache } from "@apollo/client/core";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
apollo: {
|
apollo: {
|
||||||
@ -195,7 +196,10 @@ export default class ParticipationWithoutAccount extends Vue {
|
|||||||
message: this.anonymousParticipation.message,
|
message: this.anonymousParticipation.message,
|
||||||
locale: this.$i18n.locale,
|
locale: this.$i18n.locale,
|
||||||
},
|
},
|
||||||
update: (store, { data: updateData }) => {
|
update: (
|
||||||
|
store: ApolloCache<InMemoryCache>,
|
||||||
|
{ data: updateData }: FetchResult
|
||||||
|
) => {
|
||||||
if (updateData == null) {
|
if (updateData == null) {
|
||||||
console.error(
|
console.error(
|
||||||
"Cannot update event participant cache, because of data null value."
|
"Cannot update event participant cache, because of data null value."
|
||||||
|
@ -37,12 +37,14 @@ export const FETCH_PERSON = gql`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const GET_PERSON = gql`
|
export const GET_PERSON = gql`
|
||||||
query (
|
query Person(
|
||||||
$actorId: ID!
|
$actorId: ID!
|
||||||
$organizedEventsPage: Int
|
$organizedEventsPage: Int
|
||||||
$organizedEventsLimit: Int
|
$organizedEventsLimit: Int
|
||||||
$participationPage: Int
|
$participationPage: Int
|
||||||
$participationLimit: Int
|
$participationLimit: Int
|
||||||
|
$membershipsPage: Int
|
||||||
|
$membershipsLimit: Int
|
||||||
) {
|
) {
|
||||||
person(id: $actorId) {
|
person(id: $actorId) {
|
||||||
id
|
id
|
||||||
@ -89,6 +91,24 @@ export const GET_PERSON = gql`
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
memberships(page: $membershipsPage, limit: $membershipsLimit) {
|
||||||
|
total
|
||||||
|
elements {
|
||||||
|
id
|
||||||
|
role
|
||||||
|
insertedAt
|
||||||
|
parent {
|
||||||
|
id
|
||||||
|
preferredUsername
|
||||||
|
name
|
||||||
|
domain
|
||||||
|
avatar {
|
||||||
|
id
|
||||||
|
url
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
user {
|
user {
|
||||||
id
|
id
|
||||||
email
|
email
|
||||||
|
@ -37,6 +37,7 @@ export const DASHBOARD = gql`
|
|||||||
|
|
||||||
export const RELAY_FRAGMENT = gql`
|
export const RELAY_FRAGMENT = gql`
|
||||||
fragment relayFragment on Follower {
|
fragment relayFragment on Follower {
|
||||||
|
id
|
||||||
actor {
|
actor {
|
||||||
id
|
id
|
||||||
preferredUsername
|
preferredUsername
|
||||||
|
@ -67,6 +67,17 @@ export const DISCUSSION_FIELDS_FRAGMENT = gql`
|
|||||||
text
|
text
|
||||||
insertedAt
|
insertedAt
|
||||||
updatedAt
|
updatedAt
|
||||||
|
deletedAt
|
||||||
|
publishedAt
|
||||||
|
actor {
|
||||||
|
id
|
||||||
|
domain
|
||||||
|
name
|
||||||
|
preferredUsername
|
||||||
|
avatar {
|
||||||
|
url
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
actor {
|
actor {
|
||||||
id
|
id
|
||||||
@ -104,8 +115,7 @@ export const REPLY_TO_DISCUSSION = gql`
|
|||||||
export const GET_DISCUSSION = gql`
|
export const GET_DISCUSSION = gql`
|
||||||
query getDiscussion($slug: String!, $page: Int, $limit: Int) {
|
query getDiscussion($slug: String!, $page: Int, $limit: Int) {
|
||||||
discussion(slug: $slug) {
|
discussion(slug: $slug) {
|
||||||
comments(page: $page, limit: $limit)
|
comments(page: $page, limit: $limit) {
|
||||||
@connection(key: "discussion-comments", filter: ["slug"]) {
|
|
||||||
total
|
total
|
||||||
elements {
|
elements {
|
||||||
id
|
id
|
||||||
@ -158,6 +168,8 @@ export const DISCUSSION_COMMENT_CHANGED = gql`
|
|||||||
text
|
text
|
||||||
updatedAt
|
updatedAt
|
||||||
insertedAt
|
insertedAt
|
||||||
|
deletedAt
|
||||||
|
publishedAt
|
||||||
actor {
|
actor {
|
||||||
id
|
id
|
||||||
preferredUsername
|
preferredUsername
|
||||||
|
@ -125,13 +125,13 @@ export const GROUP_FIELDS_FRAGMENTS = gql`
|
|||||||
...DiscussionBasicFields
|
...DiscussionBasicFields
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
posts {
|
posts(page: $postsPage, limit: $postsLimit) {
|
||||||
total
|
total
|
||||||
elements {
|
elements {
|
||||||
...PostBasicFields
|
...PostBasicFields
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
members {
|
members(page: $membersPage, limit: $membersLimit) {
|
||||||
elements {
|
elements {
|
||||||
id
|
id
|
||||||
role
|
role
|
||||||
@ -212,6 +212,10 @@ export const GET_GROUP = gql`
|
|||||||
$beforeDateTime: DateTime
|
$beforeDateTime: DateTime
|
||||||
$organisedEventsPage: Int
|
$organisedEventsPage: Int
|
||||||
$organisedEventslimit: Int
|
$organisedEventslimit: Int
|
||||||
|
$postsPage: Int
|
||||||
|
$postsLimit: Int
|
||||||
|
$membersPage: Int
|
||||||
|
$membersLimit: Int
|
||||||
) {
|
) {
|
||||||
getGroup(id: $id) {
|
getGroup(id: $id) {
|
||||||
mediaSize
|
mediaSize
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
import gql from "graphql-tag";
|
import gql from "graphql-tag";
|
||||||
|
|
||||||
export const REPORTS = gql`
|
export const REPORTS = gql`
|
||||||
query Reports($status: ReportStatus) {
|
query Reports($status: ReportStatus, $page: Int, $limit: Int) {
|
||||||
reports(status: $status) {
|
reports(status: $status, page: $page, limit: $limit) {
|
||||||
|
total
|
||||||
|
elements {
|
||||||
id
|
id
|
||||||
reported {
|
reported {
|
||||||
id
|
id
|
||||||
@ -38,6 +40,7 @@ export const REPORTS = gql`
|
|||||||
content
|
content
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const REPORT_FRAGMENT = gql`
|
const REPORT_FRAGMENT = gql`
|
||||||
|
@ -11,6 +11,7 @@ import {
|
|||||||
LEAVE_EVENT,
|
LEAVE_EVENT,
|
||||||
} from "../graphql/event";
|
} from "../graphql/event";
|
||||||
import { IPerson } from "../types/actor";
|
import { IPerson } from "../types/actor";
|
||||||
|
import { ApolloCache, FetchResult, InMemoryCache } from "@apollo/client/core";
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
export default class EventMixin extends mixins(Vue) {
|
export default class EventMixin extends mixins(Vue) {
|
||||||
@ -30,7 +31,7 @@ export default class EventMixin extends mixins(Vue) {
|
|||||||
actorId,
|
actorId,
|
||||||
token,
|
token,
|
||||||
},
|
},
|
||||||
update: (store, { data }) => {
|
update: (store: ApolloCache<InMemoryCache>, { data }: FetchResult) => {
|
||||||
if (data == null) return;
|
if (data == null) return;
|
||||||
let participation;
|
let participation;
|
||||||
|
|
||||||
|
@ -1,107 +1,31 @@
|
|||||||
import { Component, Vue, Ref } from "vue-property-decorator";
|
|
||||||
import { IActor } from "@/types/actor";
|
import { IActor } from "@/types/actor";
|
||||||
import { IFollower } from "@/types/actor/follower.model";
|
|
||||||
import { RELAY_FOLLOWERS, RELAY_FOLLOWINGS } from "@/graphql/admin";
|
|
||||||
import { Paginate } from "@/types/paginate";
|
|
||||||
import { ActorType } from "@/types/enums";
|
import { ActorType } from "@/types/enums";
|
||||||
|
import { Component, Vue, Ref } from "vue-property-decorator";
|
||||||
|
import VueRouter from "vue-router";
|
||||||
|
const { isNavigationFailure, NavigationFailureType } = VueRouter;
|
||||||
|
|
||||||
@Component({
|
@Component
|
||||||
apollo: {
|
|
||||||
relayFollowings: {
|
|
||||||
query: RELAY_FOLLOWINGS,
|
|
||||||
fetchPolicy: "cache-and-network",
|
|
||||||
variables() {
|
|
||||||
return {
|
|
||||||
page: this.followingsPage,
|
|
||||||
limit: this.perPage,
|
|
||||||
};
|
|
||||||
},
|
|
||||||
},
|
|
||||||
relayFollowers: {
|
|
||||||
query: RELAY_FOLLOWERS,
|
|
||||||
fetchPolicy: "cache-and-network",
|
|
||||||
variables() {
|
|
||||||
return {
|
|
||||||
page: this.followersPage,
|
|
||||||
limit: this.perPage,
|
|
||||||
};
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
export default class RelayMixin extends Vue {
|
export default class RelayMixin extends Vue {
|
||||||
@Ref("table") readonly table!: any;
|
@Ref("table") readonly table!: any;
|
||||||
|
|
||||||
relayFollowers: Paginate<IFollower> = { elements: [], total: 0 };
|
|
||||||
|
|
||||||
relayFollowings: Paginate<IFollower> = { elements: [], total: 0 };
|
|
||||||
|
|
||||||
checkedRows: IFollower[] = [];
|
|
||||||
|
|
||||||
followingsPage = 1;
|
|
||||||
|
|
||||||
followersPage = 1;
|
|
||||||
|
|
||||||
perPage = 10;
|
|
||||||
|
|
||||||
toggle(row: Record<string, unknown>): void {
|
toggle(row: Record<string, unknown>): void {
|
||||||
this.table.toggleDetails(row);
|
this.table.toggleDetails(row);
|
||||||
}
|
}
|
||||||
|
|
||||||
async onFollowingsPageChange(page: number): Promise<void> {
|
protected async pushRouter(
|
||||||
this.followingsPage = page;
|
routeName: string,
|
||||||
|
args: Record<string, string>
|
||||||
|
): Promise<void> {
|
||||||
try {
|
try {
|
||||||
await this.$apollo.queries.relayFollowings.fetchMore({
|
await this.$router.push({
|
||||||
variables: {
|
name: routeName,
|
||||||
page: this.followingsPage,
|
query: { ...this.$route.query, ...args },
|
||||||
limit: this.perPage,
|
|
||||||
},
|
|
||||||
updateQuery: (previousResult, { fetchMoreResult }) => {
|
|
||||||
if (!fetchMoreResult) return previousResult;
|
|
||||||
const newFollowings = fetchMoreResult.relayFollowings.elements;
|
|
||||||
return {
|
|
||||||
relayFollowings: {
|
|
||||||
__typename: previousResult.relayFollowings.__typename,
|
|
||||||
total: previousResult.relayFollowings.total,
|
|
||||||
elements: [
|
|
||||||
...previousResult.relayFollowings.elements,
|
|
||||||
...newFollowings,
|
|
||||||
],
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (e) {
|
||||||
console.error(err);
|
if (isNavigationFailure(e, NavigationFailureType.redirected)) {
|
||||||
|
throw Error(e.toString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async onFollowersPageChange(page: number): Promise<void> {
|
|
||||||
this.followersPage = page;
|
|
||||||
try {
|
|
||||||
await this.$apollo.queries.relayFollowers.fetchMore({
|
|
||||||
variables: {
|
|
||||||
page: this.followersPage,
|
|
||||||
limit: this.perPage,
|
|
||||||
},
|
|
||||||
updateQuery: (previousResult, { fetchMoreResult }) => {
|
|
||||||
if (!fetchMoreResult) return previousResult;
|
|
||||||
const newFollowers = fetchMoreResult.relayFollowers.elements;
|
|
||||||
return {
|
|
||||||
relayFollowers: {
|
|
||||||
__typename: previousResult.relayFollowers.__typename,
|
|
||||||
total: previousResult.relayFollowers.total,
|
|
||||||
elements: [
|
|
||||||
...previousResult.relayFollowers.elements,
|
|
||||||
...newFollowers,
|
|
||||||
],
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
|
||||||
});
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static isInstance(actor: IActor): boolean {
|
static isInstance(actor: IActor): boolean {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import apolloProvider from "@/vue-apollo";
|
import apolloProvider from "@/vue-apollo";
|
||||||
import ApolloClient from "apollo-client";
|
import { NormalizedCacheObject } from "@apollo/client/cache/inmemory/types";
|
||||||
import { NormalizedCacheObject } from "apollo-cache-inmemory";
|
import { ApolloClient } from "@apollo/client/core/ApolloClient";
|
||||||
import { WEB_PUSH } from "../graphql/config";
|
import { WEB_PUSH } from "../graphql/config";
|
||||||
import { IConfig } from "../types/config.model";
|
import { IConfig } from "../types/config.model";
|
||||||
|
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
import { ServerError, ServerParseError } from "apollo-link-http-common";
|
import { ServerParseError } from "@apollo/client/link/http";
|
||||||
|
import { ServerError } from "@apollo/client/link/utils";
|
||||||
|
|
||||||
function isServerError(
|
function isServerError(
|
||||||
err: Error | ServerError | ServerParseError | undefined
|
err: Error | ServerError | ServerParseError | undefined
|
||||||
|
@ -9,11 +9,11 @@ import {
|
|||||||
} from "@/constants";
|
} from "@/constants";
|
||||||
import { ILogin, IToken } from "@/types/login.model";
|
import { ILogin, IToken } from "@/types/login.model";
|
||||||
import { UPDATE_CURRENT_USER_CLIENT } from "@/graphql/user";
|
import { UPDATE_CURRENT_USER_CLIENT } from "@/graphql/user";
|
||||||
import ApolloClient from "apollo-client";
|
import { ApolloClient } from "@apollo/client/core/ApolloClient";
|
||||||
import { IPerson } from "@/types/actor";
|
import { IPerson } from "@/types/actor";
|
||||||
import { IDENTITIES, UPDATE_CURRENT_ACTOR_CLIENT } from "@/graphql/actor";
|
import { IDENTITIES, UPDATE_CURRENT_ACTOR_CLIENT } from "@/graphql/actor";
|
||||||
import { NormalizedCacheObject } from "apollo-cache-inmemory";
|
|
||||||
import { ICurrentUserRole } from "@/types/enums";
|
import { ICurrentUserRole } from "@/types/enums";
|
||||||
|
import { NormalizedCacheObject } from "@apollo/client/cache/inmemory/types";
|
||||||
|
|
||||||
export function saveTokenData(obj: IToken): void {
|
export function saveTokenData(obj: IToken): void {
|
||||||
localStorage.setItem(AUTH_ACCESS_TOKEN, obj.accessToken);
|
localStorage.setItem(AUTH_ACCESS_TOKEN, obj.accessToken);
|
||||||
|
@ -128,6 +128,7 @@ import { MOBILIZON_INSTANCE_HOST } from "../../api/_entrypoint";
|
|||||||
import RouteName from "../../router/name";
|
import RouteName from "../../router/name";
|
||||||
import { changeIdentity } from "../../utils/auth";
|
import { changeIdentity } from "../../utils/auth";
|
||||||
import identityEditionMixin from "../../mixins/identityEdition";
|
import identityEditionMixin from "../../mixins/identityEdition";
|
||||||
|
import { ApolloCache, FetchResult, InMemoryCache } from "@apollo/client/core";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
apollo: {
|
apollo: {
|
||||||
@ -164,7 +165,10 @@ export default class Register extends mixins(identityEditionMixin) {
|
|||||||
const { data } = await this.$apollo.mutate<{ registerPerson: IPerson }>({
|
const { data } = await this.$apollo.mutate<{ registerPerson: IPerson }>({
|
||||||
mutation: REGISTER_PERSON,
|
mutation: REGISTER_PERSON,
|
||||||
variables: { email: this.email, ...this.identity },
|
variables: { email: this.email, ...this.identity },
|
||||||
update: (store, { data: localData }) => {
|
update: (
|
||||||
|
store: ApolloCache<InMemoryCache>,
|
||||||
|
{ data: localData }: FetchResult
|
||||||
|
) => {
|
||||||
if (this.userAlreadyActivated) {
|
if (this.userAlreadyActivated) {
|
||||||
const identitiesData = store.readQuery<{ identities: IPerson[] }>({
|
const identitiesData = store.readQuery<{ identities: IPerson[] }>({
|
||||||
query: IDENTITIES,
|
query: IDENTITIES,
|
||||||
|
@ -232,9 +232,10 @@ import {
|
|||||||
DELETE_FEED_TOKEN,
|
DELETE_FEED_TOKEN,
|
||||||
} from "@/graphql/feed_tokens";
|
} from "@/graphql/feed_tokens";
|
||||||
import { IFeedToken } from "@/types/feedtoken.model";
|
import { IFeedToken } from "@/types/feedtoken.model";
|
||||||
import { ServerParseError } from "apollo-link-http-common";
|
|
||||||
import { IConfig } from "@/types/config.model";
|
import { IConfig } from "@/types/config.model";
|
||||||
import { CONFIG } from "@/graphql/config";
|
import { CONFIG } from "@/graphql/config";
|
||||||
|
import { ServerParseError } from "@apollo/client/link/http";
|
||||||
|
import { ApolloCache, FetchResult, InMemoryCache } from "@apollo/client/core";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {
|
components: {
|
||||||
@ -324,7 +325,7 @@ export default class EditIdentity extends mixins(identityEditionMixin) {
|
|||||||
variables: {
|
variables: {
|
||||||
id: this.identity.id,
|
id: this.identity.id,
|
||||||
},
|
},
|
||||||
update: (store) => {
|
update: (store: ApolloCache<InMemoryCache>) => {
|
||||||
const data = store.readQuery<{ identities: IPerson[] }>({
|
const data = store.readQuery<{ identities: IPerson[] }>({
|
||||||
query: IDENTITIES,
|
query: IDENTITIES,
|
||||||
});
|
});
|
||||||
@ -368,18 +369,21 @@ export default class EditIdentity extends mixins(identityEditionMixin) {
|
|||||||
await this.$apollo.mutate({
|
await this.$apollo.mutate({
|
||||||
mutation: UPDATE_PERSON,
|
mutation: UPDATE_PERSON,
|
||||||
variables,
|
variables,
|
||||||
update: (store, { data: { updatePerson } }) => {
|
update: (
|
||||||
|
store: ApolloCache<InMemoryCache>,
|
||||||
|
{ data: updateData }: FetchResult
|
||||||
|
) => {
|
||||||
const data = store.readQuery<{ identities: IPerson[] }>({
|
const data = store.readQuery<{ identities: IPerson[] }>({
|
||||||
query: IDENTITIES,
|
query: IDENTITIES,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (data) {
|
if (data && updateData?.updatePerson) {
|
||||||
const index = data.identities.findIndex(
|
const index = data.identities.findIndex(
|
||||||
(i) => i.id === this.identity.id
|
(i) => i.id === this.identity.id
|
||||||
);
|
);
|
||||||
|
|
||||||
this.$set(data.identities, index, updatePerson);
|
this.$set(data.identities, index, updateData?.updatePerson);
|
||||||
this.maybeUpdateCurrentActorCache(updatePerson);
|
this.maybeUpdateCurrentActorCache(updateData?.updatePerson);
|
||||||
|
|
||||||
store.writeQuery({ query: IDENTITIES, data });
|
store.writeQuery({ query: IDENTITIES, data });
|
||||||
}
|
}
|
||||||
@ -403,13 +407,16 @@ export default class EditIdentity extends mixins(identityEditionMixin) {
|
|||||||
await this.$apollo.mutate({
|
await this.$apollo.mutate({
|
||||||
mutation: CREATE_PERSON,
|
mutation: CREATE_PERSON,
|
||||||
variables,
|
variables,
|
||||||
update: (store, { data: { createPerson } }) => {
|
update: (
|
||||||
|
store: ApolloCache<InMemoryCache>,
|
||||||
|
{ data: updateData }: FetchResult
|
||||||
|
) => {
|
||||||
const data = store.readQuery<{ identities: IPerson[] }>({
|
const data = store.readQuery<{ identities: IPerson[] }>({
|
||||||
query: IDENTITIES,
|
query: IDENTITIES,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (data) {
|
if (data && updateData?.createPerson) {
|
||||||
data.identities.push(createPerson);
|
data.identities.push(updateData?.createPerson);
|
||||||
|
|
||||||
store.writeQuery({ query: IDENTITIES, data });
|
store.writeQuery({ query: IDENTITIES, data });
|
||||||
}
|
}
|
||||||
|
@ -88,6 +88,11 @@
|
|||||||
:loading="$apollo.queries.group.loading"
|
:loading="$apollo.queries.group.loading"
|
||||||
paginated
|
paginated
|
||||||
backend-pagination
|
backend-pagination
|
||||||
|
:current-page.sync="membersPage"
|
||||||
|
:aria-next-label="$t('Next page')"
|
||||||
|
:aria-previous-label="$t('Previous page')"
|
||||||
|
:aria-page-label="$t('Page')"
|
||||||
|
:aria-current-label="$t('Current page')"
|
||||||
:total="group.members.total"
|
:total="group.members.total"
|
||||||
:per-page="EVENTS_PER_PAGE"
|
:per-page="EVENTS_PER_PAGE"
|
||||||
@page-change="onMembersPageChange"
|
@page-change="onMembersPageChange"
|
||||||
@ -119,8 +124,11 @@
|
|||||||
<span v-if="props.row.actor.name">{{
|
<span v-if="props.row.actor.name">{{
|
||||||
props.row.actor.name
|
props.row.actor.name
|
||||||
}}</span
|
}}</span
|
||||||
|
><span v-else>@{{ usernameWithDomain(props.row.actor) }}</span
|
||||||
><br />
|
><br />
|
||||||
<span class="is-size-7 has-text-grey"
|
<span
|
||||||
|
v-if="props.row.actor.name"
|
||||||
|
class="is-size-7 has-text-grey"
|
||||||
>@{{ usernameWithDomain(props.row.actor) }}</span
|
>@{{ usernameWithDomain(props.row.actor) }}</span
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
@ -170,11 +178,9 @@
|
|||||||
</span>
|
</span>
|
||||||
</b-table-column>
|
</b-table-column>
|
||||||
<template slot="empty">
|
<template slot="empty">
|
||||||
<section class="section">
|
<empty-content icon="account-group" :inline="true">
|
||||||
<div class="content has-text-grey has-text-centered">
|
{{ $t("No members found") }}
|
||||||
<p>{{ $t("Nothing to see here") }}</p>
|
</empty-content>
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</template>
|
</template>
|
||||||
</b-table>
|
</b-table>
|
||||||
</section>
|
</section>
|
||||||
@ -191,6 +197,11 @@
|
|||||||
:loading="$apollo.queries.group.loading"
|
:loading="$apollo.queries.group.loading"
|
||||||
paginated
|
paginated
|
||||||
backend-pagination
|
backend-pagination
|
||||||
|
:current-page.sync="organizedEventsPage"
|
||||||
|
:aria-next-label="$t('Next page')"
|
||||||
|
:aria-previous-label="$t('Previous page')"
|
||||||
|
:aria-page-label="$t('Page')"
|
||||||
|
:aria-current-label="$t('Current page')"
|
||||||
:total="group.organizedEvents.total"
|
:total="group.organizedEvents.total"
|
||||||
:per-page="EVENTS_PER_PAGE"
|
:per-page="EVENTS_PER_PAGE"
|
||||||
@page-change="onOrganizedEventsPageChange"
|
@page-change="onOrganizedEventsPageChange"
|
||||||
@ -213,11 +224,9 @@
|
|||||||
{{ props.row.beginsOn | formatDateTimeString }}
|
{{ props.row.beginsOn | formatDateTimeString }}
|
||||||
</b-table-column>
|
</b-table-column>
|
||||||
<template slot="empty">
|
<template slot="empty">
|
||||||
<section class="section">
|
<empty-content icon="account-group" :inline="true">
|
||||||
<div class="content has-text-grey has-text-centered">
|
{{ $t("No organized events found") }}
|
||||||
<p>{{ $t("Nothing to see here") }}</p>
|
</empty-content>
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</template>
|
</template>
|
||||||
</b-table>
|
</b-table>
|
||||||
</section>
|
</section>
|
||||||
@ -234,8 +243,13 @@
|
|||||||
:loading="$apollo.queries.group.loading"
|
:loading="$apollo.queries.group.loading"
|
||||||
paginated
|
paginated
|
||||||
backend-pagination
|
backend-pagination
|
||||||
|
:current-page.sync="postsPage"
|
||||||
|
:aria-next-label="$t('Next page')"
|
||||||
|
:aria-previous-label="$t('Previous page')"
|
||||||
|
:aria-page-label="$t('Page')"
|
||||||
|
:aria-current-label="$t('Current page')"
|
||||||
:total="group.posts.total"
|
:total="group.posts.total"
|
||||||
:per-page="EVENTS_PER_PAGE"
|
:per-page="POSTS_PER_PAGE"
|
||||||
@page-change="onPostsPageChange"
|
@page-change="onPostsPageChange"
|
||||||
>
|
>
|
||||||
<b-table-column field="title" :label="$t('Title')" v-slot="props">
|
<b-table-column field="title" :label="$t('Title')" v-slot="props">
|
||||||
@ -256,11 +270,9 @@
|
|||||||
{{ props.row.publishAt | formatDateTimeString }}
|
{{ props.row.publishAt | formatDateTimeString }}
|
||||||
</b-table-column>
|
</b-table-column>
|
||||||
<template slot="empty">
|
<template slot="empty">
|
||||||
<section class="section">
|
<empty-content icon="bullhorn" :inline="true">
|
||||||
<div class="content has-text-grey has-text-centered">
|
{{ $t("No posts found") }}
|
||||||
<p>{{ $t("Nothing to see here") }}</p>
|
</empty-content>
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</template>
|
</template>
|
||||||
</b-table>
|
</b-table>
|
||||||
</section>
|
</section>
|
||||||
@ -276,8 +288,14 @@ import { IGroup } from "../../types/actor";
|
|||||||
import { usernameWithDomain, IActor } from "../../types/actor/actor.model";
|
import { usernameWithDomain, IActor } from "../../types/actor/actor.model";
|
||||||
import RouteName from "../../router/name";
|
import RouteName from "../../router/name";
|
||||||
import ActorCard from "../../components/Account/ActorCard.vue";
|
import ActorCard from "../../components/Account/ActorCard.vue";
|
||||||
|
import EmptyContent from "../../components/Utils/EmptyContent.vue";
|
||||||
|
import { ApolloCache, FetchResult, InMemoryCache } from "@apollo/client/core";
|
||||||
|
import VueRouter from "vue-router";
|
||||||
|
const { isNavigationFailure, NavigationFailureType } = VueRouter;
|
||||||
|
|
||||||
const EVENTS_PER_PAGE = 10;
|
const EVENTS_PER_PAGE = 3;
|
||||||
|
const POSTS_PER_PAGE = 1;
|
||||||
|
const MEMBERS_PER_PAGE = 3;
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
apollo: {
|
apollo: {
|
||||||
@ -287,8 +305,10 @@ const EVENTS_PER_PAGE = 10;
|
|||||||
variables() {
|
variables() {
|
||||||
return {
|
return {
|
||||||
id: this.id,
|
id: this.id,
|
||||||
organizedEventsPage: 1,
|
organizedEventsPage: this.organizedEventsPage,
|
||||||
organizedEventsLimit: EVENTS_PER_PAGE,
|
organizedEventsLimit: EVENTS_PER_PAGE,
|
||||||
|
postsPage: this.postsPage,
|
||||||
|
postsLimit: POSTS_PER_PAGE,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
skip() {
|
skip() {
|
||||||
@ -299,6 +319,7 @@ const EVENTS_PER_PAGE = 10;
|
|||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
ActorCard,
|
ActorCard,
|
||||||
|
EmptyContent,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
export default class AdminGroupProfile extends Vue {
|
export default class AdminGroupProfile extends Vue {
|
||||||
@ -312,14 +333,39 @@ export default class AdminGroupProfile extends Vue {
|
|||||||
|
|
||||||
EVENTS_PER_PAGE = EVENTS_PER_PAGE;
|
EVENTS_PER_PAGE = EVENTS_PER_PAGE;
|
||||||
|
|
||||||
organizedEventsPage = 1;
|
POSTS_PER_PAGE = POSTS_PER_PAGE;
|
||||||
|
|
||||||
membersPage = 1;
|
MEMBERS_PER_PAGE = MEMBERS_PER_PAGE;
|
||||||
|
|
||||||
postsPage = 1;
|
|
||||||
|
|
||||||
MemberRole = MemberRole;
|
MemberRole = MemberRole;
|
||||||
|
|
||||||
|
get organizedEventsPage(): number {
|
||||||
|
return parseInt(
|
||||||
|
(this.$route.query.organizedEventsPage as string) || "1",
|
||||||
|
10
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
set organizedEventsPage(page: number) {
|
||||||
|
this.pushRouter({ organizedEventsPage: page.toString() });
|
||||||
|
}
|
||||||
|
|
||||||
|
get membersPage(): number {
|
||||||
|
return parseInt((this.$route.query.membersPage as string) || "1", 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
set membersPage(page: number) {
|
||||||
|
this.pushRouter({ membersPage: page.toString() });
|
||||||
|
}
|
||||||
|
|
||||||
|
get postsPage(): number {
|
||||||
|
return parseInt((this.$route.query.postsPage as string) || "1", 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
set postsPage(page: number) {
|
||||||
|
this.pushRouter({ postsPage: page.toString() });
|
||||||
|
}
|
||||||
|
|
||||||
get metadata(): Array<Record<string, string>> {
|
get metadata(): Array<Record<string, string>> {
|
||||||
if (!this.group) return [];
|
if (!this.group) return [];
|
||||||
const res: Record<string, string>[] = [
|
const res: Record<string, string>[] = [
|
||||||
@ -367,12 +413,13 @@ export default class AdminGroupProfile extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async suspendProfile(): Promise<void> {
|
async suspendProfile(): Promise<void> {
|
||||||
this.$apollo.mutate<{ suspendProfile: { id: string } }>({
|
try {
|
||||||
|
await this.$apollo.mutate<{ suspendProfile: { id: string } }>({
|
||||||
mutation: SUSPEND_PROFILE,
|
mutation: SUSPEND_PROFILE,
|
||||||
variables: {
|
variables: {
|
||||||
id: this.id,
|
id: this.id,
|
||||||
},
|
},
|
||||||
update: (store, { data }) => {
|
update: (store: ApolloCache<InMemoryCache>, { data }: FetchResult) => {
|
||||||
if (data == null) return;
|
if (data == null) return;
|
||||||
const profileId = this.id;
|
const profileId = this.id;
|
||||||
|
|
||||||
@ -384,23 +431,31 @@ export default class AdminGroupProfile extends Vue {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (!profileData) return;
|
if (!profileData) return;
|
||||||
const { getGroup: group } = profileData;
|
|
||||||
group.suspended = true;
|
|
||||||
group.avatar = null;
|
|
||||||
group.name = "";
|
|
||||||
group.summary = "";
|
|
||||||
store.writeQuery({
|
store.writeQuery({
|
||||||
query: GET_GROUP,
|
query: GET_GROUP,
|
||||||
variables: {
|
variables: {
|
||||||
id: profileId,
|
id: profileId,
|
||||||
},
|
},
|
||||||
data: { getGroup: group },
|
data: {
|
||||||
|
getGroup: {
|
||||||
|
...profileData.getGroup,
|
||||||
|
suspended: true,
|
||||||
|
avatar: null,
|
||||||
|
name: "",
|
||||||
|
summary: "",
|
||||||
|
},
|
||||||
|
},
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
this.$notifier.error(this.$t("Error while suspending group") as string);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async unsuspendProfile(): Promise<void> {
|
async unsuspendProfile(): Promise<void> {
|
||||||
|
try {
|
||||||
const profileID = this.id;
|
const profileID = this.id;
|
||||||
await this.$apollo.mutate<{ unsuspendProfile: { id: string } }>({
|
await this.$apollo.mutate<{ unsuspendProfile: { id: string } }>({
|
||||||
mutation: UNSUSPEND_PROFILE,
|
mutation: UNSUSPEND_PROFILE,
|
||||||
@ -416,15 +471,27 @@ export default class AdminGroupProfile extends Vue {
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
this.$notifier.error(this.$t("Error while suspending group") as string);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async refreshProfile(): Promise<void> {
|
async refreshProfile(): Promise<void> {
|
||||||
|
try {
|
||||||
this.$apollo.mutate<{ refreshProfile: IActor }>({
|
this.$apollo.mutate<{ refreshProfile: IActor }>({
|
||||||
mutation: REFRESH_PROFILE,
|
mutation: REFRESH_PROFILE,
|
||||||
variables: {
|
variables: {
|
||||||
actorId: this.id,
|
actorId: this.id,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
this.$notifier.success(
|
||||||
|
this.$t("Triggered profile refreshment") as string
|
||||||
|
);
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
this.$notifier.error(this.$t("Error while suspending group") as string);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async onOrganizedEventsPageChange(page: number): Promise<void> {
|
async onOrganizedEventsPageChange(page: number): Promise<void> {
|
||||||
@ -435,24 +502,6 @@ export default class AdminGroupProfile extends Vue {
|
|||||||
organizedEventsPage: this.organizedEventsPage,
|
organizedEventsPage: this.organizedEventsPage,
|
||||||
organizedEventsLimit: EVENTS_PER_PAGE,
|
organizedEventsLimit: EVENTS_PER_PAGE,
|
||||||
},
|
},
|
||||||
updateQuery: (previousResult, { fetchMoreResult }) => {
|
|
||||||
if (!fetchMoreResult) return previousResult;
|
|
||||||
const newOrganizedEvents =
|
|
||||||
fetchMoreResult.group.organizedEvents.elements;
|
|
||||||
return {
|
|
||||||
group: {
|
|
||||||
...previousResult.group,
|
|
||||||
organizedEvents: {
|
|
||||||
__typename: previousResult.group.organizedEvents.__typename,
|
|
||||||
total: previousResult.group.organizedEvents.total,
|
|
||||||
elements: [
|
|
||||||
...previousResult.group.organizedEvents.elements,
|
|
||||||
...newOrganizedEvents,
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -464,23 +513,6 @@ export default class AdminGroupProfile extends Vue {
|
|||||||
memberPage: this.membersPage,
|
memberPage: this.membersPage,
|
||||||
memberLimit: EVENTS_PER_PAGE,
|
memberLimit: EVENTS_PER_PAGE,
|
||||||
},
|
},
|
||||||
updateQuery: (previousResult, { fetchMoreResult }) => {
|
|
||||||
if (!fetchMoreResult) return previousResult;
|
|
||||||
const newMembers = fetchMoreResult.group.members.elements;
|
|
||||||
return {
|
|
||||||
group: {
|
|
||||||
...previousResult.group,
|
|
||||||
members: {
|
|
||||||
__typename: previousResult.group.members.__typename,
|
|
||||||
total: previousResult.group.members.total,
|
|
||||||
elements: [
|
|
||||||
...previousResult.group.members.elements,
|
|
||||||
...newMembers,
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -490,24 +522,23 @@ export default class AdminGroupProfile extends Vue {
|
|||||||
variables: {
|
variables: {
|
||||||
actorId: this.id,
|
actorId: this.id,
|
||||||
postsPage: this.postsPage,
|
postsPage: this.postsPage,
|
||||||
postLimit: EVENTS_PER_PAGE,
|
postLimit: POSTS_PER_PAGE,
|
||||||
},
|
|
||||||
updateQuery: (previousResult, { fetchMoreResult }) => {
|
|
||||||
if (!fetchMoreResult) return previousResult;
|
|
||||||
const newPosts = fetchMoreResult.group.posts.elements;
|
|
||||||
return {
|
|
||||||
group: {
|
|
||||||
...previousResult.group,
|
|
||||||
posts: {
|
|
||||||
__typename: previousResult.group.posts.__typename,
|
|
||||||
total: previousResult.group.posts.total,
|
|
||||||
elements: [...previousResult.group.posts.elements, ...newPosts],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async pushRouter(args: Record<string, string>): Promise<void> {
|
||||||
|
try {
|
||||||
|
await this.$router.push({
|
||||||
|
name: RouteName.ADMIN_GROUP_PROFILE,
|
||||||
|
query: { ...this.$route.query, ...args },
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
if (isNavigationFailure(e, NavigationFailureType.redirected)) {
|
||||||
|
throw Error(e.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -74,6 +74,11 @@
|
|||||||
:loading="$apollo.queries.person.loading"
|
:loading="$apollo.queries.person.loading"
|
||||||
paginated
|
paginated
|
||||||
backend-pagination
|
backend-pagination
|
||||||
|
:current-page.sync="organizedEventsPage"
|
||||||
|
:aria-next-label="$t('Next page')"
|
||||||
|
:aria-previous-label="$t('Previous page')"
|
||||||
|
:aria-page-label="$t('Page')"
|
||||||
|
:aria-current-label="$t('Current page')"
|
||||||
:total="person.organizedEvents.total"
|
:total="person.organizedEvents.total"
|
||||||
:per-page="EVENTS_PER_PAGE"
|
:per-page="EVENTS_PER_PAGE"
|
||||||
@page-change="onOrganizedEventsPageChange"
|
@page-change="onOrganizedEventsPageChange"
|
||||||
@ -93,11 +98,9 @@
|
|||||||
</router-link>
|
</router-link>
|
||||||
</b-table-column>
|
</b-table-column>
|
||||||
<template slot="empty">
|
<template slot="empty">
|
||||||
<section class="section">
|
<empty-content icon="account-group" :inline="true">
|
||||||
<div class="content has-text-grey has-text-centered">
|
{{ $t("No organized events listed") }}
|
||||||
<p>{{ $t("Nothing to see here") }}</p>
|
</empty-content>
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</template>
|
</template>
|
||||||
</b-table>
|
</b-table>
|
||||||
</section>
|
</section>
|
||||||
@ -115,9 +118,14 @@
|
|||||||
(participation) => participation.event
|
(participation) => participation.event
|
||||||
)
|
)
|
||||||
"
|
"
|
||||||
:loading="$apollo.queries.person.loading"
|
:loading="$apollo.loading"
|
||||||
paginated
|
paginated
|
||||||
backend-pagination
|
backend-pagination
|
||||||
|
:current-page.sync="participationsPage"
|
||||||
|
:aria-next-label="$t('Next page')"
|
||||||
|
:aria-previous-label="$t('Previous page')"
|
||||||
|
:aria-page-label="$t('Page')"
|
||||||
|
:aria-current-label="$t('Current page')"
|
||||||
:total="person.participations.total"
|
:total="person.participations.total"
|
||||||
:per-page="EVENTS_PER_PAGE"
|
:per-page="EVENTS_PER_PAGE"
|
||||||
@page-change="onParticipationsPageChange"
|
@page-change="onParticipationsPageChange"
|
||||||
@ -137,11 +145,115 @@
|
|||||||
</router-link>
|
</router-link>
|
||||||
</b-table-column>
|
</b-table-column>
|
||||||
<template slot="empty">
|
<template slot="empty">
|
||||||
<section class="section">
|
<empty-content icon="account-group" :inline="true">
|
||||||
<div class="content has-text-grey has-text-centered">
|
{{ $t("No participations listed") }}
|
||||||
<p>{{ $t("Nothing to see here") }}</p>
|
</empty-content>
|
||||||
</div>
|
</template>
|
||||||
|
</b-table>
|
||||||
</section>
|
</section>
|
||||||
|
<section>
|
||||||
|
<h2 class="subtitle">
|
||||||
|
{{
|
||||||
|
$tc("{number} memberships", person.memberships.total, {
|
||||||
|
number: person.memberships.total,
|
||||||
|
})
|
||||||
|
}}
|
||||||
|
</h2>
|
||||||
|
<b-table
|
||||||
|
:data="person.memberships.elements"
|
||||||
|
:loading="$apollo.loading"
|
||||||
|
paginated
|
||||||
|
backend-pagination
|
||||||
|
:current-page.sync="membershipsPage"
|
||||||
|
:aria-next-label="$t('Next page')"
|
||||||
|
:aria-previous-label="$t('Previous page')"
|
||||||
|
:aria-page-label="$t('Page')"
|
||||||
|
:aria-current-label="$t('Current page')"
|
||||||
|
:total="person.memberships.total"
|
||||||
|
:per-page="EVENTS_PER_PAGE"
|
||||||
|
@page-change="onMembershipsPageChange"
|
||||||
|
>
|
||||||
|
<b-table-column
|
||||||
|
field="parent.preferredUsername"
|
||||||
|
:label="$t('Group')"
|
||||||
|
v-slot="props"
|
||||||
|
>
|
||||||
|
<article class="media">
|
||||||
|
<figure
|
||||||
|
class="media-left image is-48x48"
|
||||||
|
v-if="props.row.parent.avatar"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
class="is-rounded"
|
||||||
|
:src="props.row.parent.avatar.url"
|
||||||
|
alt=""
|
||||||
|
/>
|
||||||
|
</figure>
|
||||||
|
<b-icon
|
||||||
|
class="media-left"
|
||||||
|
v-else
|
||||||
|
size="is-large"
|
||||||
|
icon="account-circle"
|
||||||
|
/>
|
||||||
|
<div class="media-content">
|
||||||
|
<div class="content">
|
||||||
|
<span v-if="props.row.parent.name">{{
|
||||||
|
props.row.parent.name
|
||||||
|
}}</span
|
||||||
|
><br />
|
||||||
|
<span class="is-size-7 has-text-grey"
|
||||||
|
>@{{ usernameWithDomain(props.row.parent) }}</span
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
|
</b-table-column>
|
||||||
|
<b-table-column field="role" :label="$t('Role')" v-slot="props">
|
||||||
|
<b-tag
|
||||||
|
type="is-primary"
|
||||||
|
v-if="props.row.role === MemberRole.ADMINISTRATOR"
|
||||||
|
>
|
||||||
|
{{ $t("Administrator") }}
|
||||||
|
</b-tag>
|
||||||
|
<b-tag
|
||||||
|
type="is-primary"
|
||||||
|
v-else-if="props.row.role === MemberRole.MODERATOR"
|
||||||
|
>
|
||||||
|
{{ $t("Moderator") }}
|
||||||
|
</b-tag>
|
||||||
|
<b-tag v-else-if="props.row.role === MemberRole.MEMBER">
|
||||||
|
{{ $t("Member") }}
|
||||||
|
</b-tag>
|
||||||
|
<b-tag
|
||||||
|
type="is-warning"
|
||||||
|
v-else-if="props.row.role === MemberRole.NOT_APPROVED"
|
||||||
|
>
|
||||||
|
{{ $t("Not approved") }}
|
||||||
|
</b-tag>
|
||||||
|
<b-tag
|
||||||
|
type="is-danger"
|
||||||
|
v-else-if="props.row.role === MemberRole.REJECTED"
|
||||||
|
>
|
||||||
|
{{ $t("Rejected") }}
|
||||||
|
</b-tag>
|
||||||
|
<b-tag
|
||||||
|
type="is-danger"
|
||||||
|
v-else-if="props.row.role === MemberRole.INVITED"
|
||||||
|
>
|
||||||
|
{{ $t("Invited") }}
|
||||||
|
</b-tag>
|
||||||
|
</b-table-column>
|
||||||
|
<b-table-column field="insertedAt" :label="$t('Date')" v-slot="props">
|
||||||
|
<span class="has-text-centered">
|
||||||
|
{{ props.row.insertedAt | formatDateString }}<br />{{
|
||||||
|
props.row.insertedAt | formatTimeString
|
||||||
|
}}
|
||||||
|
</span>
|
||||||
|
</b-table-column>
|
||||||
|
<template slot="empty">
|
||||||
|
<empty-content icon="account-group" :inline="true">
|
||||||
|
{{ $t("No memberships found") }}
|
||||||
|
</empty-content>
|
||||||
</template>
|
</template>
|
||||||
</b-table>
|
</b-table>
|
||||||
</section>
|
</section>
|
||||||
@ -159,8 +271,15 @@ import { IPerson } from "../../types/actor";
|
|||||||
import { usernameWithDomain } from "../../types/actor/actor.model";
|
import { usernameWithDomain } from "../../types/actor/actor.model";
|
||||||
import RouteName from "../../router/name";
|
import RouteName from "../../router/name";
|
||||||
import ActorCard from "../../components/Account/ActorCard.vue";
|
import ActorCard from "../../components/Account/ActorCard.vue";
|
||||||
|
import EmptyContent from "../../components/Utils/EmptyContent.vue";
|
||||||
|
import { ApolloCache, FetchResult, InMemoryCache } from "@apollo/client/core";
|
||||||
|
import VueRouter from "vue-router";
|
||||||
|
import { MemberRole } from "@/types/enums";
|
||||||
|
const { isNavigationFailure, NavigationFailureType } = VueRouter;
|
||||||
|
|
||||||
const EVENTS_PER_PAGE = 10;
|
const EVENTS_PER_PAGE = 10;
|
||||||
|
const PARTICIPATIONS_PER_PAGE = 10;
|
||||||
|
const MEMBERSHIPS_PER_PAGE = 10;
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
apollo: {
|
apollo: {
|
||||||
@ -170,8 +289,12 @@ const EVENTS_PER_PAGE = 10;
|
|||||||
variables() {
|
variables() {
|
||||||
return {
|
return {
|
||||||
actorId: this.id,
|
actorId: this.id,
|
||||||
organizedEventsPage: 1,
|
organizedEventsPage: this.organizedEventsPage,
|
||||||
organizedEventsLimit: EVENTS_PER_PAGE,
|
organizedEventsLimit: EVENTS_PER_PAGE,
|
||||||
|
participationsPage: this.participationsPage,
|
||||||
|
participationLimit: PARTICIPATIONS_PER_PAGE,
|
||||||
|
membershipsPage: this.membershipsPage,
|
||||||
|
membershipsLimit: MEMBERSHIPS_PER_PAGE,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
skip() {
|
skip() {
|
||||||
@ -181,6 +304,7 @@ const EVENTS_PER_PAGE = 10;
|
|||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
ActorCard,
|
ActorCard,
|
||||||
|
EmptyContent,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
export default class AdminProfile extends Vue {
|
export default class AdminProfile extends Vue {
|
||||||
@ -194,9 +318,41 @@ export default class AdminProfile extends Vue {
|
|||||||
|
|
||||||
EVENTS_PER_PAGE = EVENTS_PER_PAGE;
|
EVENTS_PER_PAGE = EVENTS_PER_PAGE;
|
||||||
|
|
||||||
organizedEventsPage = 1;
|
PARTICIPATIONS_PER_PAGE = PARTICIPATIONS_PER_PAGE;
|
||||||
|
|
||||||
participationsPage = 1;
|
MEMBERSHIPS_PER_PAGE = MEMBERSHIPS_PER_PAGE;
|
||||||
|
|
||||||
|
MemberRole = MemberRole;
|
||||||
|
|
||||||
|
get organizedEventsPage(): number {
|
||||||
|
return parseInt(
|
||||||
|
(this.$route.query.organizedEventsPage as string) || "1",
|
||||||
|
10
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
set organizedEventsPage(page: number) {
|
||||||
|
this.pushRouter({ organizedEventsPage: page.toString() });
|
||||||
|
}
|
||||||
|
|
||||||
|
get participationsPage(): number {
|
||||||
|
return parseInt(
|
||||||
|
(this.$route.query.participationsPage as string) || "1",
|
||||||
|
10
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
set participationsPage(page: number) {
|
||||||
|
this.pushRouter({ participationsPage: page.toString() });
|
||||||
|
}
|
||||||
|
|
||||||
|
get membershipsPage(): number {
|
||||||
|
return parseInt((this.$route.query.membershipsPage as string) || "1", 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
set membershipsPage(page: number) {
|
||||||
|
this.pushRouter({ membershipsPage: page.toString() });
|
||||||
|
}
|
||||||
|
|
||||||
get metadata(): Array<Record<string, unknown>> {
|
get metadata(): Array<Record<string, unknown>> {
|
||||||
if (!this.person) return [];
|
if (!this.person) return [];
|
||||||
@ -233,7 +389,7 @@ export default class AdminProfile extends Vue {
|
|||||||
variables: {
|
variables: {
|
||||||
id: this.id,
|
id: this.id,
|
||||||
},
|
},
|
||||||
update: (store, { data }) => {
|
update: (store: ApolloCache<InMemoryCache>, { data }: FetchResult) => {
|
||||||
if (data == null) return;
|
if (data == null) return;
|
||||||
const profileId = this.id;
|
const profileId = this.id;
|
||||||
|
|
||||||
@ -248,16 +404,20 @@ export default class AdminProfile extends Vue {
|
|||||||
|
|
||||||
if (!profileData) return;
|
if (!profileData) return;
|
||||||
const { person } = profileData;
|
const { person } = profileData;
|
||||||
person.suspended = true;
|
|
||||||
person.avatar = null;
|
|
||||||
person.name = "";
|
|
||||||
person.summary = "";
|
|
||||||
store.writeQuery({
|
store.writeQuery({
|
||||||
query: GET_PERSON,
|
query: GET_PERSON,
|
||||||
variables: {
|
variables: {
|
||||||
actorId: profileId,
|
actorId: profileId,
|
||||||
},
|
},
|
||||||
data: { person },
|
data: {
|
||||||
|
person: {
|
||||||
|
...person,
|
||||||
|
suspended: true,
|
||||||
|
avatar: null,
|
||||||
|
name: "",
|
||||||
|
summary: "",
|
||||||
|
},
|
||||||
|
},
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@ -283,63 +443,48 @@ export default class AdminProfile extends Vue {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async onOrganizedEventsPageChange(page: number): Promise<void> {
|
async onOrganizedEventsPageChange(): Promise<void> {
|
||||||
this.organizedEventsPage = page;
|
|
||||||
await this.$apollo.queries.person.fetchMore({
|
await this.$apollo.queries.person.fetchMore({
|
||||||
variables: {
|
variables: {
|
||||||
actorId: this.id,
|
actorId: this.id,
|
||||||
organizedEventsPage: this.organizedEventsPage,
|
organizedEventsPage: this.organizedEventsPage,
|
||||||
organizedEventsLimit: EVENTS_PER_PAGE,
|
organizedEventsLimit: EVENTS_PER_PAGE,
|
||||||
},
|
},
|
||||||
updateQuery: (previousResult, { fetchMoreResult }) => {
|
|
||||||
if (!fetchMoreResult) return previousResult;
|
|
||||||
const newOrganizedEvents =
|
|
||||||
fetchMoreResult.person.organizedEvents.elements;
|
|
||||||
return {
|
|
||||||
person: {
|
|
||||||
...previousResult.person,
|
|
||||||
organizedEvents: {
|
|
||||||
__typename: previousResult.person.organizedEvents.__typename,
|
|
||||||
total: previousResult.person.organizedEvents.total,
|
|
||||||
elements: [
|
|
||||||
...previousResult.person.organizedEvents.elements,
|
|
||||||
...newOrganizedEvents,
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async onParticipationsPageChange(page: number): Promise<void> {
|
async onParticipationsPageChange(): Promise<void> {
|
||||||
this.participationsPage = page;
|
|
||||||
await this.$apollo.queries.person.fetchMore({
|
await this.$apollo.queries.person.fetchMore({
|
||||||
variables: {
|
variables: {
|
||||||
actorId: this.id,
|
actorId: this.id,
|
||||||
participationPage: this.participationsPage,
|
participationPage: this.participationsPage,
|
||||||
participationLimit: EVENTS_PER_PAGE,
|
participationLimit: PARTICIPATIONS_PER_PAGE,
|
||||||
},
|
|
||||||
updateQuery: (previousResult, { fetchMoreResult }) => {
|
|
||||||
if (!fetchMoreResult) return previousResult;
|
|
||||||
const newParticipations =
|
|
||||||
fetchMoreResult.person.participations.elements;
|
|
||||||
return {
|
|
||||||
person: {
|
|
||||||
...previousResult.person,
|
|
||||||
participations: {
|
|
||||||
__typename: previousResult.person.participations.__typename,
|
|
||||||
total: previousResult.person.participations.total,
|
|
||||||
elements: [
|
|
||||||
...previousResult.person.participations.elements,
|
|
||||||
...newParticipations,
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async onMembershipsPageChange(): Promise<void> {
|
||||||
|
await this.$apollo.queries.person.fetchMore({
|
||||||
|
variables: {
|
||||||
|
actorId: this.id,
|
||||||
|
membershipsPage: this.participationsPage,
|
||||||
|
membershipsLimit: MEMBERSHIPS_PER_PAGE,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private async pushRouter(args: Record<string, string>): Promise<void> {
|
||||||
|
try {
|
||||||
|
await this.$router.push({
|
||||||
|
name: RouteName.ADMIN_PROFILE,
|
||||||
|
query: { ...this.$route.query, ...args },
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
if (isNavigationFailure(e, NavigationFailureType.redirected)) {
|
||||||
|
throw Error(e.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -32,7 +32,6 @@
|
|||||||
tag="li"
|
tag="li"
|
||||||
active-class="is-active"
|
active-class="is-active"
|
||||||
:to="{ name: RouteName.RELAY_FOLLOWINGS }"
|
:to="{ name: RouteName.RELAY_FOLLOWINGS }"
|
||||||
exact
|
|
||||||
>
|
>
|
||||||
<a>
|
<a>
|
||||||
<b-icon icon="inbox-arrow-down"></b-icon>
|
<b-icon icon="inbox-arrow-down"></b-icon>
|
||||||
@ -46,7 +45,6 @@
|
|||||||
tag="li"
|
tag="li"
|
||||||
active-class="is-active"
|
active-class="is-active"
|
||||||
:to="{ name: RouteName.RELAY_FOLLOWERS }"
|
:to="{ name: RouteName.RELAY_FOLLOWERS }"
|
||||||
exact
|
|
||||||
>
|
>
|
||||||
<a>
|
<a>
|
||||||
<b-icon icon="inbox-arrow-up"></b-icon>
|
<b-icon icon="inbox-arrow-up"></b-icon>
|
||||||
|
@ -23,6 +23,12 @@
|
|||||||
paginated
|
paginated
|
||||||
backend-pagination
|
backend-pagination
|
||||||
backend-filtering
|
backend-filtering
|
||||||
|
:debounce-search="200"
|
||||||
|
:current-page.sync="page"
|
||||||
|
:aria-next-label="$t('Next page')"
|
||||||
|
:aria-previous-label="$t('Previous page')"
|
||||||
|
:aria-page-label="$t('Page')"
|
||||||
|
:aria-current-label="$t('Current page')"
|
||||||
:total="groups.total"
|
:total="groups.total"
|
||||||
:per-page="PROFILES_PER_PAGE"
|
:per-page="PROFILES_PER_PAGE"
|
||||||
@page-change="onPageChange"
|
@page-change="onPageChange"
|
||||||
@ -81,20 +87,21 @@
|
|||||||
</template>
|
</template>
|
||||||
</b-table-column>
|
</b-table-column>
|
||||||
<template slot="empty">
|
<template slot="empty">
|
||||||
<section class="section">
|
<empty-content icon="account-group" :inline="true">
|
||||||
<div class="content has-text-grey has-text-centered">
|
{{ $t("No group matches the filters") }}
|
||||||
<p>{{ $t("No profile matches the filters") }}</p>
|
</empty-content>
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</template>
|
</template>
|
||||||
</b-table>
|
</b-table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Vue, Watch } from "vue-property-decorator";
|
import { Component, Vue } from "vue-property-decorator";
|
||||||
import { LIST_GROUPS } from "@/graphql/group";
|
import { LIST_GROUPS } from "@/graphql/group";
|
||||||
import RouteName from "../../router/name";
|
import RouteName from "../../router/name";
|
||||||
|
import EmptyContent from "../../components/Utils/EmptyContent.vue";
|
||||||
|
import VueRouter from "vue-router";
|
||||||
|
const { isNavigationFailure, NavigationFailureType } = VueRouter;
|
||||||
|
|
||||||
const PROFILES_PER_PAGE = 10;
|
const PROFILES_PER_PAGE = 10;
|
||||||
|
|
||||||
@ -102,7 +109,6 @@ const PROFILES_PER_PAGE = 10;
|
|||||||
apollo: {
|
apollo: {
|
||||||
groups: {
|
groups: {
|
||||||
query: LIST_GROUPS,
|
query: LIST_GROUPS,
|
||||||
fetchPolicy: "cache-and-network",
|
|
||||||
variables() {
|
variables() {
|
||||||
return {
|
return {
|
||||||
preferredUsername: this.preferredUsername,
|
preferredUsername: this.preferredUsername,
|
||||||
@ -110,54 +116,65 @@ const PROFILES_PER_PAGE = 10;
|
|||||||
domain: this.domain,
|
domain: this.domain,
|
||||||
local: this.local,
|
local: this.local,
|
||||||
suspended: this.suspended,
|
suspended: this.suspended,
|
||||||
page: 1,
|
page: this.page,
|
||||||
limit: PROFILES_PER_PAGE,
|
limit: PROFILES_PER_PAGE,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
components: {
|
||||||
|
EmptyContent,
|
||||||
|
},
|
||||||
})
|
})
|
||||||
export default class GroupProfiles extends Vue {
|
export default class GroupProfiles extends Vue {
|
||||||
page = 1;
|
|
||||||
|
|
||||||
preferredUsername = "";
|
|
||||||
|
|
||||||
name = "";
|
name = "";
|
||||||
|
|
||||||
domain = "";
|
|
||||||
|
|
||||||
local = true;
|
|
||||||
|
|
||||||
suspended = false;
|
|
||||||
|
|
||||||
PROFILES_PER_PAGE = PROFILES_PER_PAGE;
|
PROFILES_PER_PAGE = PROFILES_PER_PAGE;
|
||||||
|
|
||||||
RouteName = RouteName;
|
RouteName = RouteName;
|
||||||
|
|
||||||
async onPageChange(page: number): Promise<void> {
|
async onPageChange(): Promise<void> {
|
||||||
this.page = page;
|
await this.doFetchMore();
|
||||||
await this.$apollo.queries.groups.fetchMore({
|
}
|
||||||
variables: {
|
|
||||||
preferredUsername: this.preferredUsername,
|
get page(): number {
|
||||||
name: this.name,
|
return parseInt((this.$route.query.page as string) || "1", 10);
|
||||||
domain: this.domain,
|
}
|
||||||
local: this.local,
|
|
||||||
suspended: this.suspended,
|
set page(page: number) {
|
||||||
page: this.page,
|
this.pushRouter({ page: page.toString() });
|
||||||
limit: PROFILES_PER_PAGE,
|
}
|
||||||
},
|
|
||||||
updateQuery: (previousResult, { fetchMoreResult }) => {
|
get domain(): string {
|
||||||
if (!fetchMoreResult) return previousResult;
|
return (this.$route.query.domain as string) || "";
|
||||||
const newProfiles = fetchMoreResult.groups.elements;
|
}
|
||||||
return {
|
|
||||||
groups: {
|
set domain(domain: string) {
|
||||||
__typename: previousResult.groups.__typename,
|
this.pushRouter({ domain });
|
||||||
total: previousResult.groups.total,
|
}
|
||||||
elements: [...previousResult.groups.elements, ...newProfiles],
|
|
||||||
},
|
get preferredUsername(): string {
|
||||||
};
|
return (this.$route.query.preferredUsername as string) || "";
|
||||||
},
|
}
|
||||||
});
|
|
||||||
|
set preferredUsername(preferredUsername: string) {
|
||||||
|
this.pushRouter({ preferredUsername });
|
||||||
|
}
|
||||||
|
|
||||||
|
get local(): boolean {
|
||||||
|
return this.$route.query.local === "1";
|
||||||
|
}
|
||||||
|
|
||||||
|
set local(local: boolean) {
|
||||||
|
this.pushRouter({ local: local ? "1" : "0" });
|
||||||
|
}
|
||||||
|
|
||||||
|
get suspended(): boolean {
|
||||||
|
return this.$route.query.suspended === "1";
|
||||||
|
}
|
||||||
|
|
||||||
|
set suspended(suspended: boolean) {
|
||||||
|
this.pushRouter({ suspended: suspended ? "1" : "0" });
|
||||||
}
|
}
|
||||||
|
|
||||||
onFiltersChange({
|
onFiltersChange({
|
||||||
@ -169,11 +186,34 @@ export default class GroupProfiles extends Vue {
|
|||||||
}): void {
|
}): void {
|
||||||
this.preferredUsername = preferredUsername;
|
this.preferredUsername = preferredUsername;
|
||||||
this.domain = domain;
|
this.domain = domain;
|
||||||
|
this.doFetchMore();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Watch("domain")
|
private async pushRouter(args: Record<string, string>): Promise<void> {
|
||||||
domainNotLocal(): void {
|
try {
|
||||||
this.local = this.domain === "";
|
await this.$router.push({
|
||||||
|
name: RouteName.ADMIN_GROUPS,
|
||||||
|
query: { ...this.$route.query, ...args },
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
if (isNavigationFailure(e, NavigationFailureType.redirected)) {
|
||||||
|
throw Error(e.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async doFetchMore(): Promise<void> {
|
||||||
|
await this.$apollo.queries.groups.fetchMore({
|
||||||
|
variables: {
|
||||||
|
preferredUsername: this.preferredUsername,
|
||||||
|
name: this.name,
|
||||||
|
domain: this.domain,
|
||||||
|
local: this.local,
|
||||||
|
suspended: this.suspended,
|
||||||
|
page: this.page,
|
||||||
|
limit: PROFILES_PER_PAGE,
|
||||||
|
},
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
@ -23,6 +23,12 @@
|
|||||||
paginated
|
paginated
|
||||||
backend-pagination
|
backend-pagination
|
||||||
backend-filtering
|
backend-filtering
|
||||||
|
:debounce-search="200"
|
||||||
|
:current-page.sync="page"
|
||||||
|
:aria-next-label="$t('Next page')"
|
||||||
|
:aria-previous-label="$t('Previous page')"
|
||||||
|
:aria-page-label="$t('Page')"
|
||||||
|
:aria-current-label="$t('Current page')"
|
||||||
:total="persons.total"
|
:total="persons.total"
|
||||||
:per-page="PROFILES_PER_PAGE"
|
:per-page="PROFILES_PER_PAGE"
|
||||||
@page-change="onPageChange"
|
@page-change="onPageChange"
|
||||||
@ -81,20 +87,21 @@
|
|||||||
</template>
|
</template>
|
||||||
</b-table-column>
|
</b-table-column>
|
||||||
<template slot="empty">
|
<template slot="empty">
|
||||||
<section class="section">
|
<empty-content icon="account" :inline="true">
|
||||||
<div class="content has-text-grey has-text-centered">
|
{{ $t("No profile matches the filters") }}
|
||||||
<p>{{ $t("No profile matches the filters") }}</p>
|
</empty-content>
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</template>
|
</template>
|
||||||
</b-table>
|
</b-table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Vue, Watch } from "vue-property-decorator";
|
import { Component, Vue } from "vue-property-decorator";
|
||||||
import { LIST_PROFILES } from "../../graphql/actor";
|
import { LIST_PROFILES } from "../../graphql/actor";
|
||||||
import RouteName from "../../router/name";
|
import RouteName from "../../router/name";
|
||||||
|
import EmptyContent from "../../components/Utils/EmptyContent.vue";
|
||||||
|
import VueRouter from "vue-router";
|
||||||
|
const { isNavigationFailure, NavigationFailureType } = VueRouter;
|
||||||
|
|
||||||
const PROFILES_PER_PAGE = 10;
|
const PROFILES_PER_PAGE = 10;
|
||||||
|
|
||||||
@ -110,53 +117,88 @@ const PROFILES_PER_PAGE = 10;
|
|||||||
domain: this.domain,
|
domain: this.domain,
|
||||||
local: this.local,
|
local: this.local,
|
||||||
suspended: this.suspended,
|
suspended: this.suspended,
|
||||||
page: 1,
|
page: this.page,
|
||||||
limit: PROFILES_PER_PAGE,
|
limit: PROFILES_PER_PAGE,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
components: {
|
||||||
|
EmptyContent,
|
||||||
|
},
|
||||||
})
|
})
|
||||||
export default class Profiles extends Vue {
|
export default class Profiles extends Vue {
|
||||||
page = 1;
|
|
||||||
|
|
||||||
preferredUsername = "";
|
|
||||||
|
|
||||||
name = "";
|
|
||||||
|
|
||||||
domain = "";
|
|
||||||
|
|
||||||
local = true;
|
|
||||||
|
|
||||||
suspended = false;
|
|
||||||
|
|
||||||
PROFILES_PER_PAGE = PROFILES_PER_PAGE;
|
PROFILES_PER_PAGE = PROFILES_PER_PAGE;
|
||||||
|
|
||||||
RouteName = RouteName;
|
RouteName = RouteName;
|
||||||
|
|
||||||
async onPageChange(page: number): Promise<void> {
|
async onPageChange(): Promise<void> {
|
||||||
this.page = page;
|
await this.doFetchMore();
|
||||||
|
}
|
||||||
|
|
||||||
|
get page(): number {
|
||||||
|
return parseInt((this.$route.query.page as string) || "1", 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
set page(page: number) {
|
||||||
|
this.pushRouter({ page: page.toString() });
|
||||||
|
}
|
||||||
|
|
||||||
|
get domain(): string {
|
||||||
|
return (this.$route.query.domain as string) || "";
|
||||||
|
}
|
||||||
|
|
||||||
|
set domain(domain: string) {
|
||||||
|
this.pushRouter({ domain });
|
||||||
|
}
|
||||||
|
|
||||||
|
get preferredUsername(): string {
|
||||||
|
return (this.$route.query.preferredUsername as string) || "";
|
||||||
|
}
|
||||||
|
|
||||||
|
set preferredUsername(preferredUsername: string) {
|
||||||
|
this.pushRouter({ preferredUsername });
|
||||||
|
}
|
||||||
|
|
||||||
|
get local(): boolean {
|
||||||
|
return this.$route.query.local === "1";
|
||||||
|
}
|
||||||
|
|
||||||
|
set local(local: boolean) {
|
||||||
|
this.pushRouter({ local: local ? "1" : "0" });
|
||||||
|
}
|
||||||
|
|
||||||
|
get suspended(): boolean {
|
||||||
|
return this.$route.query.suspended === "1";
|
||||||
|
}
|
||||||
|
|
||||||
|
set suspended(suspended: boolean) {
|
||||||
|
this.pushRouter({ suspended: suspended ? "1" : "0" });
|
||||||
|
}
|
||||||
|
|
||||||
|
private async pushRouter(args: Record<string, string>): Promise<void> {
|
||||||
|
try {
|
||||||
|
await this.$router.push({
|
||||||
|
name: RouteName.PROFILES,
|
||||||
|
query: { ...this.$route.query, ...args },
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
if (isNavigationFailure(e, NavigationFailureType.redirected)) {
|
||||||
|
throw Error(e.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async doFetchMore(): Promise<void> {
|
||||||
await this.$apollo.queries.persons.fetchMore({
|
await this.$apollo.queries.persons.fetchMore({
|
||||||
variables: {
|
variables: {
|
||||||
preferredUsername: this.preferredUsername,
|
preferredUsername: this.preferredUsername,
|
||||||
name: this.name,
|
|
||||||
domain: this.domain,
|
domain: this.domain,
|
||||||
local: this.local,
|
local: this.local,
|
||||||
suspended: this.suspended,
|
suspended: this.suspended,
|
||||||
page: this.page,
|
page: this.page,
|
||||||
limit: PROFILES_PER_PAGE,
|
limit: PROFILES_PER_PAGE,
|
||||||
},
|
},
|
||||||
updateQuery: (previousResult, { fetchMoreResult }) => {
|
|
||||||
if (!fetchMoreResult) return previousResult;
|
|
||||||
const newProfiles = fetchMoreResult.persons.elements;
|
|
||||||
return {
|
|
||||||
persons: {
|
|
||||||
__typename: previousResult.persons.__typename,
|
|
||||||
total: previousResult.persons.total,
|
|
||||||
elements: [...previousResult.persons.elements, ...newProfiles],
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -169,11 +211,7 @@ export default class Profiles extends Vue {
|
|||||||
}): void {
|
}): void {
|
||||||
this.preferredUsername = preferredUsername;
|
this.preferredUsername = preferredUsername;
|
||||||
this.domain = domain;
|
this.domain = domain;
|
||||||
}
|
this.doFetchMore();
|
||||||
|
|
||||||
@Watch("domain")
|
|
||||||
domainNotLocal(): void {
|
|
||||||
this.local = this.domain === "";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
@ -22,6 +22,11 @@
|
|||||||
backend-pagination
|
backend-pagination
|
||||||
backend-filtering
|
backend-filtering
|
||||||
detailed
|
detailed
|
||||||
|
:current-page.sync="page"
|
||||||
|
:aria-next-label="$t('Next page')"
|
||||||
|
:aria-previous-label="$t('Previous page')"
|
||||||
|
:aria-page-label="$t('Page')"
|
||||||
|
:aria-current-label="$t('Current page')"
|
||||||
:show-detail-icon="true"
|
:show-detail-icon="true"
|
||||||
:total="users.total"
|
:total="users.total"
|
||||||
:per-page="USERS_PER_PAGE"
|
:per-page="USERS_PER_PAGE"
|
||||||
@ -108,6 +113,8 @@
|
|||||||
import { Component, Vue } from "vue-property-decorator";
|
import { Component, Vue } from "vue-property-decorator";
|
||||||
import { LIST_USERS } from "../../graphql/user";
|
import { LIST_USERS } from "../../graphql/user";
|
||||||
import RouteName from "../../router/name";
|
import RouteName from "../../router/name";
|
||||||
|
import VueRouter from "vue-router";
|
||||||
|
const { isNavigationFailure, NavigationFailureType } = VueRouter;
|
||||||
|
|
||||||
const USERS_PER_PAGE = 10;
|
const USERS_PER_PAGE = 10;
|
||||||
|
|
||||||
@ -119,7 +126,7 @@ const USERS_PER_PAGE = 10;
|
|||||||
variables() {
|
variables() {
|
||||||
return {
|
return {
|
||||||
email: this.email,
|
email: this.email,
|
||||||
page: 1,
|
page: this.page,
|
||||||
limit: USERS_PER_PAGE,
|
limit: USERS_PER_PAGE,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@ -127,14 +134,26 @@ const USERS_PER_PAGE = 10;
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
export default class Users extends Vue {
|
export default class Users extends Vue {
|
||||||
page = 1;
|
|
||||||
|
|
||||||
email = "";
|
|
||||||
|
|
||||||
USERS_PER_PAGE = USERS_PER_PAGE;
|
USERS_PER_PAGE = USERS_PER_PAGE;
|
||||||
|
|
||||||
RouteName = RouteName;
|
RouteName = RouteName;
|
||||||
|
|
||||||
|
get page(): number {
|
||||||
|
return parseInt((this.$route.query.page as string) || "1", 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
set page(page: number) {
|
||||||
|
this.pushRouter({ page: page.toString() });
|
||||||
|
}
|
||||||
|
|
||||||
|
get email(): string {
|
||||||
|
return (this.$route.query.email as string) || "";
|
||||||
|
}
|
||||||
|
|
||||||
|
set email(email: string) {
|
||||||
|
this.pushRouter({ email });
|
||||||
|
}
|
||||||
|
|
||||||
async onPageChange(page: number): Promise<void> {
|
async onPageChange(page: number): Promise<void> {
|
||||||
this.page = page;
|
this.page = page;
|
||||||
await this.$apollo.queries.users.fetchMore({
|
await this.$apollo.queries.users.fetchMore({
|
||||||
@ -143,23 +162,25 @@ export default class Users extends Vue {
|
|||||||
page: this.page,
|
page: this.page,
|
||||||
limit: USERS_PER_PAGE,
|
limit: USERS_PER_PAGE,
|
||||||
},
|
},
|
||||||
updateQuery: (previousResult, { fetchMoreResult }) => {
|
|
||||||
if (!fetchMoreResult) return previousResult;
|
|
||||||
const newFollowings = fetchMoreResult.users.elements;
|
|
||||||
return {
|
|
||||||
users: {
|
|
||||||
__typename: previousResult.users.__typename,
|
|
||||||
total: previousResult.users.total,
|
|
||||||
elements: [...previousResult.users.elements, ...newFollowings],
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
onFiltersChange({ email }: { email: string }): void {
|
onFiltersChange({ email }: { email: string }): void {
|
||||||
this.email = email;
|
this.email = email;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async pushRouter(args: Record<string, string>): Promise<void> {
|
||||||
|
try {
|
||||||
|
await this.$router.push({
|
||||||
|
name: RouteName.USERS,
|
||||||
|
query: { ...this.$route.query, ...args },
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
if (isNavigationFailure(e, NavigationFailureType.redirected)) {
|
||||||
|
throw Error(e.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -143,6 +143,7 @@ import { DELETE_COMMENT, UPDATE_COMMENT } from "@/graphql/comment";
|
|||||||
import GroupMixin from "@/mixins/group";
|
import GroupMixin from "@/mixins/group";
|
||||||
import RouteName from "../../router/name";
|
import RouteName from "../../router/name";
|
||||||
import { IComment } from "../../types/comment.model";
|
import { IComment } from "../../types/comment.model";
|
||||||
|
import { ApolloCache, FetchResult, InMemoryCache } from "@apollo/client/core";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
apollo: {
|
apollo: {
|
||||||
@ -168,24 +169,36 @@ import { IComment } from "../../types/comment.model";
|
|||||||
variables() {
|
variables() {
|
||||||
return {
|
return {
|
||||||
slug: this.slug,
|
slug: this.slug,
|
||||||
|
page: this.page,
|
||||||
|
limit: this.COMMENTS_PER_PAGE,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
updateQuery: (previousResult, { subscriptionData }) => {
|
updateQuery: function (
|
||||||
const previousDiscussion = previousResult.discussion;
|
previousResult: any,
|
||||||
console.log("updating subscription with ", subscriptionData);
|
{ subscriptionData }: { subscriptionData: any }
|
||||||
if (
|
|
||||||
!previousDiscussion.comments.elements.find(
|
|
||||||
(comment: IComment) =>
|
|
||||||
comment.id ===
|
|
||||||
subscriptionData.data.discussionCommentChanged.lastComment.id
|
|
||||||
)
|
|
||||||
) {
|
) {
|
||||||
previousDiscussion.lastComment =
|
const previousDiscussion = previousResult.discussion;
|
||||||
|
const lastComment =
|
||||||
subscriptionData.data.discussionCommentChanged.lastComment;
|
subscriptionData.data.discussionCommentChanged.lastComment;
|
||||||
previousDiscussion.comments.elements.push(
|
const canLoadMore = !previousDiscussion.comments.elements.find(
|
||||||
subscriptionData.data.discussionCommentChanged.lastComment
|
(comment: IComment) => comment.id === lastComment.id
|
||||||
);
|
);
|
||||||
previousDiscussion.comments.total += 1;
|
if (canLoadMore) {
|
||||||
|
return {
|
||||||
|
discussion: {
|
||||||
|
...previousDiscussion,
|
||||||
|
lastComment: lastComment,
|
||||||
|
comments: {
|
||||||
|
elements: [
|
||||||
|
...previousDiscussion.comments.elements.filter(
|
||||||
|
({ id }: { id: string }) => id !== lastComment.id
|
||||||
|
),
|
||||||
|
lastComment,
|
||||||
|
],
|
||||||
|
total: previousDiscussion.comments.total + 1,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
return previousDiscussion;
|
return previousDiscussion;
|
||||||
@ -239,29 +252,6 @@ export default class discussion extends mixins(GroupMixin) {
|
|||||||
discussionId: this.discussion.id,
|
discussionId: this.discussion.id,
|
||||||
text: this.newComment,
|
text: this.newComment,
|
||||||
},
|
},
|
||||||
update: (store, { data: { replyToDiscussion } }) => {
|
|
||||||
const discussionData = store.readQuery<{
|
|
||||||
discussion: IDiscussion;
|
|
||||||
}>({
|
|
||||||
query: GET_DISCUSSION,
|
|
||||||
variables: {
|
|
||||||
slug: this.slug,
|
|
||||||
page: this.page,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
if (!discussionData) return;
|
|
||||||
const { discussion: discussionCached } = discussionData;
|
|
||||||
discussionCached.lastComment = replyToDiscussion.lastComment;
|
|
||||||
discussionCached.comments.elements.push(replyToDiscussion.lastComment);
|
|
||||||
discussionCached.comments.total += 1;
|
|
||||||
store.writeQuery({
|
|
||||||
query: GET_DISCUSSION,
|
|
||||||
variables: { slug: this.slug, page: this.page },
|
|
||||||
data: { discussion: discussionCached },
|
|
||||||
});
|
|
||||||
},
|
|
||||||
// We don't need to handle cache update since
|
|
||||||
// there's the subscription that handles this for us
|
|
||||||
});
|
});
|
||||||
this.newComment = "";
|
this.newComment = "";
|
||||||
}
|
}
|
||||||
@ -273,7 +263,7 @@ export default class discussion extends mixins(GroupMixin) {
|
|||||||
commentId: comment.id,
|
commentId: comment.id,
|
||||||
text: comment.text,
|
text: comment.text,
|
||||||
},
|
},
|
||||||
update: (store, { data }) => {
|
update: (store: ApolloCache<InMemoryCache>, { data }: FetchResult) => {
|
||||||
if (!data || !data.deleteComment) return;
|
if (!data || !data.deleteComment) return;
|
||||||
const discussionData = store.readQuery<{
|
const discussionData = store.readQuery<{
|
||||||
discussion: IDiscussion;
|
discussion: IDiscussion;
|
||||||
@ -308,7 +298,7 @@ export default class discussion extends mixins(GroupMixin) {
|
|||||||
variables: {
|
variables: {
|
||||||
commentId: comment.id,
|
commentId: comment.id,
|
||||||
},
|
},
|
||||||
update: (store, { data }) => {
|
update: (store: ApolloCache<InMemoryCache>, { data }: FetchResult) => {
|
||||||
if (!data || !data.deleteComment) return;
|
if (!data || !data.deleteComment) return;
|
||||||
const discussionData = store.readQuery<{
|
const discussionData = store.readQuery<{
|
||||||
discussion: IDiscussion;
|
discussion: IDiscussion;
|
||||||
@ -324,17 +314,30 @@ export default class discussion extends mixins(GroupMixin) {
|
|||||||
const index = discussionCached.comments.elements.findIndex(
|
const index = discussionCached.comments.elements.findIndex(
|
||||||
({ id }) => id === data.deleteComment.id
|
({ id }) => id === data.deleteComment.id
|
||||||
);
|
);
|
||||||
|
let discussionUpdated = discussionCached;
|
||||||
if (index > -1) {
|
if (index > -1) {
|
||||||
const updatedComment = discussionCached.comments.elements[index];
|
const updatedComment = {
|
||||||
updatedComment.deletedAt = new Date();
|
...discussionCached.comments.elements[index],
|
||||||
updatedComment.actor = null;
|
deletedAt: new Date(),
|
||||||
updatedComment.text = "";
|
actor: null,
|
||||||
discussionCached.comments.elements.splice(index, 1, updatedComment);
|
updatedComment: {
|
||||||
|
text: "",
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const elements = [...discussionCached.comments.elements];
|
||||||
|
elements.splice(index, 1, updatedComment);
|
||||||
|
discussionUpdated = {
|
||||||
|
...discussionCached,
|
||||||
|
comments: {
|
||||||
|
total: discussionCached.comments.total,
|
||||||
|
elements,
|
||||||
|
},
|
||||||
|
};
|
||||||
}
|
}
|
||||||
store.writeQuery({
|
store.writeQuery({
|
||||||
query: GET_DISCUSSION,
|
query: GET_DISCUSSION,
|
||||||
variables: { slug: this.slug, page: this.page },
|
variables: { slug: this.slug, page: this.page },
|
||||||
data: { discussion: discussionCached },
|
data: { discussion: discussionUpdated },
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@ -351,19 +354,6 @@ export default class discussion extends mixins(GroupMixin) {
|
|||||||
page: this.page,
|
page: this.page,
|
||||||
limit: this.COMMENTS_PER_PAGE,
|
limit: this.COMMENTS_PER_PAGE,
|
||||||
},
|
},
|
||||||
// Transform the previous result with new data
|
|
||||||
updateQuery: (previousResult, { fetchMoreResult }) => {
|
|
||||||
if (!fetchMoreResult) return previousResult;
|
|
||||||
const newComments = fetchMoreResult.discussion.comments.elements;
|
|
||||||
this.hasMoreComments = newComments.length === 1;
|
|
||||||
const { discussion: discussionCached } = previousResult;
|
|
||||||
discussionCached.comments.elements = [
|
|
||||||
...previousResult.discussion.comments.elements,
|
|
||||||
...newComments,
|
|
||||||
];
|
|
||||||
|
|
||||||
return { discussion: discussionCached };
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error(e);
|
console.error(e);
|
||||||
@ -377,7 +367,10 @@ export default class discussion extends mixins(GroupMixin) {
|
|||||||
discussionId: this.discussion.id,
|
discussionId: this.discussion.id,
|
||||||
title: this.newTitle,
|
title: this.newTitle,
|
||||||
},
|
},
|
||||||
update: (store, { data: { updateDiscussion } }) => {
|
update: (
|
||||||
|
store: ApolloCache<InMemoryCache>,
|
||||||
|
{ data }: FetchResult<{ updateDiscussion: IDiscussion }>
|
||||||
|
) => {
|
||||||
const discussionData = store.readQuery<{
|
const discussionData = store.readQuery<{
|
||||||
discussion: IDiscussion;
|
discussion: IDiscussion;
|
||||||
}>({
|
}>({
|
||||||
@ -387,14 +380,18 @@ export default class discussion extends mixins(GroupMixin) {
|
|||||||
page: this.page,
|
page: this.page,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
if (!discussionData) return;
|
if (discussionData && data?.updateDiscussion) {
|
||||||
const { discussion: discussionCached } = discussionData;
|
|
||||||
discussionCached.title = updateDiscussion.title;
|
|
||||||
store.writeQuery({
|
store.writeQuery({
|
||||||
query: GET_DISCUSSION,
|
query: GET_DISCUSSION,
|
||||||
variables: { slug: this.slug, page: this.page },
|
variables: { slug: this.slug, page: this.page },
|
||||||
data: { discussion: discussionCached },
|
data: {
|
||||||
|
discussion: {
|
||||||
|
...discussionData.discussion,
|
||||||
|
title: data?.updateDiscussion.title,
|
||||||
|
},
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
}
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
this.editTitleMode = false;
|
this.editTitleMode = false;
|
||||||
|
@ -442,7 +442,7 @@ section {
|
|||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Prop, Vue, Watch } from "vue-property-decorator";
|
import { Component, Prop, Vue, Watch } from "vue-property-decorator";
|
||||||
import { RefetchQueryDescription } from "apollo-client/core/watchQueryOptions";
|
import { RefetchQueryDescription } from "@apollo/client/core/watchQueryOptions";
|
||||||
import PictureUpload from "@/components/PictureUpload.vue";
|
import PictureUpload from "@/components/PictureUpload.vue";
|
||||||
import EditorComponent from "@/components/Editor.vue";
|
import EditorComponent from "@/components/Editor.vue";
|
||||||
import TagInput from "@/components/Event/TagInput.vue";
|
import TagInput from "@/components/Event/TagInput.vue";
|
||||||
@ -485,6 +485,7 @@ import RouteName from "../../router/name";
|
|||||||
import "intersection-observer";
|
import "intersection-observer";
|
||||||
import { CONFIG } from "../../graphql/config";
|
import { CONFIG } from "../../graphql/config";
|
||||||
import { IConfig } from "../../types/config.model";
|
import { IConfig } from "../../types/config.model";
|
||||||
|
import { ApolloCache, FetchResult, InMemoryCache } from "@apollo/client/core";
|
||||||
|
|
||||||
const DEFAULT_LIMIT_NUMBER_OF_PLACES = 10;
|
const DEFAULT_LIMIT_NUMBER_OF_PLACES = 10;
|
||||||
|
|
||||||
@ -706,10 +707,12 @@ export default class EditEvent extends Vue {
|
|||||||
const { data } = await this.$apollo.mutate({
|
const { data } = await this.$apollo.mutate({
|
||||||
mutation: CREATE_EVENT,
|
mutation: CREATE_EVENT,
|
||||||
variables,
|
variables,
|
||||||
update: (store, { data: { createEvent } }) =>
|
update: (
|
||||||
this.postCreateOrUpdate(store, createEvent),
|
store: ApolloCache<InMemoryCache>,
|
||||||
refetchQueries: ({ data: { createEvent } }) =>
|
{ data: updatedData }: FetchResult
|
||||||
this.postRefetchQueries(createEvent),
|
) => this.postCreateOrUpdate(store, updatedData?.createEvent),
|
||||||
|
refetchQueries: ({ data: updatedData }: FetchResult) =>
|
||||||
|
this.postRefetchQueries(updatedData?.createEvent),
|
||||||
});
|
});
|
||||||
|
|
||||||
this.$buefy.notification.open({
|
this.$buefy.notification.open({
|
||||||
@ -739,10 +742,12 @@ export default class EditEvent extends Vue {
|
|||||||
await this.$apollo.mutate({
|
await this.$apollo.mutate({
|
||||||
mutation: EDIT_EVENT,
|
mutation: EDIT_EVENT,
|
||||||
variables,
|
variables,
|
||||||
update: (store, { data: { updateEvent } }) =>
|
update: (
|
||||||
this.postCreateOrUpdate(store, updateEvent),
|
store: ApolloCache<InMemoryCache>,
|
||||||
refetchQueries: ({ data: { updateEvent } }) =>
|
{ data: updatedData }: FetchResult
|
||||||
this.postRefetchQueries(updateEvent),
|
) => this.postCreateOrUpdate(store, updatedData?.updateEvent),
|
||||||
|
refetchQueries: ({ data }: FetchResult) =>
|
||||||
|
this.postRefetchQueries(data?.updateEvent),
|
||||||
});
|
});
|
||||||
|
|
||||||
this.$buefy.notification.open({
|
this.$buefy.notification.open({
|
||||||
|
@ -665,6 +665,7 @@ import EventMetadataBlock from "../../components/Event/EventMetadataBlock.vue";
|
|||||||
import ActorCard from "../../components/Account/ActorCard.vue";
|
import ActorCard from "../../components/Account/ActorCard.vue";
|
||||||
import PopoverActorCard from "../../components/Account/PopoverActorCard.vue";
|
import PopoverActorCard from "../../components/Account/PopoverActorCard.vue";
|
||||||
import { IParticipant } from "../../types/participant.model";
|
import { IParticipant } from "../../types/participant.model";
|
||||||
|
import { ApolloCache, FetchResult, InMemoryCache } from "@apollo/client/core";
|
||||||
|
|
||||||
// noinspection TypeScriptValidateTypes
|
// noinspection TypeScriptValidateTypes
|
||||||
@Component({
|
@Component({
|
||||||
@ -1002,7 +1003,7 @@ export default class Event extends EventMixin {
|
|||||||
actorId: identity.id,
|
actorId: identity.id,
|
||||||
message,
|
message,
|
||||||
},
|
},
|
||||||
update: (store, { data }) => {
|
update: (store: ApolloCache<InMemoryCache>, { data }: FetchResult) => {
|
||||||
if (data == null) return;
|
if (data == null) return;
|
||||||
|
|
||||||
const participationCachedData = store.readQuery<{ person: IPerson }>({
|
const participationCachedData = store.readQuery<{ person: IPerson }>({
|
||||||
|
@ -265,28 +265,6 @@ export default class MyEvents extends Vue {
|
|||||||
page: this.futurePage,
|
page: this.futurePage,
|
||||||
limit: this.limit,
|
limit: this.limit,
|
||||||
},
|
},
|
||||||
// Transform the previous result with new data
|
|
||||||
updateQuery: (previousResult, { fetchMoreResult }) => {
|
|
||||||
const oldParticipations = previousResult.loggedUser.participations;
|
|
||||||
const newParticipations = fetchMoreResult.loggedUser.participations;
|
|
||||||
this.hasMoreFutureParticipations =
|
|
||||||
newParticipations.total ===
|
|
||||||
oldParticipations.length + newParticipations.length;
|
|
||||||
|
|
||||||
return {
|
|
||||||
loggedUser: {
|
|
||||||
__typename: previousResult.loggedUser.__typename,
|
|
||||||
participations: {
|
|
||||||
__typename: newParticipations.__typename,
|
|
||||||
total: newParticipations.total,
|
|
||||||
elements: [
|
|
||||||
...oldParticipations.elements,
|
|
||||||
...newParticipations.elements,
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -298,28 +276,6 @@ export default class MyEvents extends Vue {
|
|||||||
page: this.pastPage,
|
page: this.pastPage,
|
||||||
limit: this.limit,
|
limit: this.limit,
|
||||||
},
|
},
|
||||||
// Transform the previous result with new data
|
|
||||||
updateQuery: (previousResult, { fetchMoreResult }) => {
|
|
||||||
const oldParticipations = previousResult.loggedUser.participations;
|
|
||||||
const newParticipations = fetchMoreResult.loggedUser.participations;
|
|
||||||
this.hasMorePastParticipations =
|
|
||||||
newParticipations.total ===
|
|
||||||
oldParticipations.length + newParticipations.length;
|
|
||||||
|
|
||||||
return {
|
|
||||||
loggedUser: {
|
|
||||||
__typename: previousResult.loggedUser.__typename,
|
|
||||||
participations: {
|
|
||||||
__typename: newParticipations.__typename,
|
|
||||||
total: newParticipations.total,
|
|
||||||
elements: [
|
|
||||||
...oldParticipations.elements,
|
|
||||||
...newParticipations.elements,
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -308,25 +308,6 @@ export default class Participants extends Vue {
|
|||||||
page: this.page,
|
page: this.page,
|
||||||
limit: this.limit,
|
limit: this.limit,
|
||||||
},
|
},
|
||||||
// Transform the previous result with new data
|
|
||||||
updateQuery: (previousResult, { fetchMoreResult }) => {
|
|
||||||
const oldParticipants = previousResult.event.participants;
|
|
||||||
const newParticipants = fetchMoreResult.event.participants;
|
|
||||||
|
|
||||||
return {
|
|
||||||
event: {
|
|
||||||
...previousResult.event,
|
|
||||||
participants: {
|
|
||||||
elements: [
|
|
||||||
...oldParticipants.elements,
|
|
||||||
...newParticipants.elements,
|
|
||||||
],
|
|
||||||
total: newParticipants.total,
|
|
||||||
__typename: oldParticipants.__typename,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -92,10 +92,11 @@ import { MemberRole } from "@/types/enums";
|
|||||||
import RouteName from "../../router/name";
|
import RouteName from "../../router/name";
|
||||||
import { convertToUsername } from "../../utils/username";
|
import { convertToUsername } from "../../utils/username";
|
||||||
import PictureUpload from "../../components/PictureUpload.vue";
|
import PictureUpload from "../../components/PictureUpload.vue";
|
||||||
import { ErrorResponse } from "apollo-link-error";
|
|
||||||
import { ServerParseError } from "apollo-link-http-common";
|
|
||||||
import { CONFIG } from "@/graphql/config";
|
import { CONFIG } from "@/graphql/config";
|
||||||
import { IConfig } from "@/types/config.model";
|
import { IConfig } from "@/types/config.model";
|
||||||
|
import { ErrorResponse } from "@apollo/client/link/error";
|
||||||
|
import { ServerParseError } from "@apollo/client/link/http";
|
||||||
|
import { ApolloCache, FetchResult, InMemoryCache } from "@apollo/client/core";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {
|
components: {
|
||||||
@ -129,7 +130,7 @@ export default class CreateGroup extends mixins(IdentityEditionMixin) {
|
|||||||
await this.$apollo.mutate({
|
await this.$apollo.mutate({
|
||||||
mutation: CREATE_GROUP,
|
mutation: CREATE_GROUP,
|
||||||
variables: this.buildVariables(),
|
variables: this.buildVariables(),
|
||||||
update: (store, { data: { createGroup } }) => {
|
update: (store: ApolloCache<InMemoryCache>, { data }: FetchResult) => {
|
||||||
const query = {
|
const query = {
|
||||||
query: PERSON_MEMBERSHIPS,
|
query: PERSON_MEMBERSHIPS,
|
||||||
variables: {
|
variables: {
|
||||||
@ -140,7 +141,7 @@ export default class CreateGroup extends mixins(IdentityEditionMixin) {
|
|||||||
if (!membershipData) return;
|
if (!membershipData) return;
|
||||||
const { person } = membershipData;
|
const { person } = membershipData;
|
||||||
person.memberships.elements.push({
|
person.memberships.elements.push({
|
||||||
parent: createGroup,
|
parent: data?.createGroup,
|
||||||
role: MemberRole.ADMINISTRATOR,
|
role: MemberRole.ADMINISTRATOR,
|
||||||
actor: this.currentActor,
|
actor: this.currentActor,
|
||||||
insertedAt: new Date().toString(),
|
insertedAt: new Date().toString(),
|
||||||
|
@ -209,17 +209,6 @@ export default class GroupFollowers extends mixins(GroupMixin) {
|
|||||||
approved: !pending,
|
approved: !pending,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
// Transform the previous result with new data
|
|
||||||
updateQuery: (previousResult, { fetchMoreResult }) => {
|
|
||||||
if (!fetchMoreResult) return previousResult;
|
|
||||||
const oldFollowers = previousResult.group.followers;
|
|
||||||
const newFollowers = fetchMoreResult.group.followers;
|
|
||||||
return {
|
|
||||||
elements: [...oldFollowers.elements, ...newFollowers.elements],
|
|
||||||
total: newFollowers.total,
|
|
||||||
__typename: oldFollowers.__typename,
|
|
||||||
};
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -360,17 +360,6 @@ export default class GroupMembers extends mixins(GroupMixin) {
|
|||||||
roles,
|
roles,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
// Transform the previous result with new data
|
|
||||||
updateQuery: (previousResult, { fetchMoreResult }) => {
|
|
||||||
if (!fetchMoreResult) return previousResult;
|
|
||||||
const oldMembers = previousResult.group.members;
|
|
||||||
const newMembers = fetchMoreResult.group.members;
|
|
||||||
return {
|
|
||||||
elements: [...oldMembers.elements, ...newMembers.elements],
|
|
||||||
total: newMembers.total,
|
|
||||||
__typename: oldMembers.__typename,
|
|
||||||
};
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -184,8 +184,8 @@ import { IGroup, usernameWithDomain } from "../../types/actor";
|
|||||||
import { Address, IAddress } from "../../types/address.model";
|
import { Address, IAddress } from "../../types/address.model";
|
||||||
import { CONFIG } from "@/graphql/config";
|
import { CONFIG } from "@/graphql/config";
|
||||||
import { IConfig } from "@/types/config.model";
|
import { IConfig } from "@/types/config.model";
|
||||||
import { ErrorResponse } from "apollo-link-error";
|
import { ServerParseError } from "@apollo/client/link/http";
|
||||||
import { ServerParseError } from "apollo-link-http-common";
|
import { ErrorResponse } from "@apollo/client/link/error";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {
|
components: {
|
||||||
|
@ -325,24 +325,6 @@ export default class Timeline extends Vue {
|
|||||||
page: this.page,
|
page: this.page,
|
||||||
limit: PAGINATION_LIMIT,
|
limit: PAGINATION_LIMIT,
|
||||||
},
|
},
|
||||||
updateQuery: (previousResult, { fetchMoreResult }) => {
|
|
||||||
if (!fetchMoreResult) return previousResult;
|
|
||||||
const newActivities = fetchMoreResult.group.activity.elements;
|
|
||||||
const newTotal = fetchMoreResult.group.activity.total;
|
|
||||||
return {
|
|
||||||
group: {
|
|
||||||
...previousResult.group,
|
|
||||||
activity: {
|
|
||||||
__typename: previousResult.group.activity.__typename,
|
|
||||||
total: newTotal,
|
|
||||||
elements: [
|
|
||||||
...previousResult.group.activity.elements,
|
|
||||||
...newActivities,
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error(e);
|
console.error(e);
|
||||||
|
@ -33,6 +33,7 @@ import { INTERACT } from "@/graphql/search";
|
|||||||
import { IEvent } from "@/types/event.model";
|
import { IEvent } from "@/types/event.model";
|
||||||
import { IGroup, usernameWithDomain } from "@/types/actor";
|
import { IGroup, usernameWithDomain } from "@/types/actor";
|
||||||
import RouteName from "../router/name";
|
import RouteName from "../router/name";
|
||||||
|
import { GraphQLError } from "graphql";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
apollo: {
|
apollo: {
|
||||||
@ -56,7 +57,7 @@ import RouteName from "../router/name";
|
|||||||
if (networkError) {
|
if (networkError) {
|
||||||
this.errors = [networkError.message];
|
this.errors = [networkError.message];
|
||||||
}
|
}
|
||||||
this.errors = graphQLErrors.map((error) => error.message);
|
this.errors = graphQLErrors.map((error: GraphQLError) => error.message);
|
||||||
},
|
},
|
||||||
async result({ data: { interact } }) {
|
async result({ data: { interact } }) {
|
||||||
switch (interact.__typename) {
|
switch (interact.__typename) {
|
||||||
|
@ -301,6 +301,8 @@ import { DELETE_COMMENT } from "@/graphql/comment";
|
|||||||
import { IComment } from "@/types/comment.model";
|
import { IComment } from "@/types/comment.model";
|
||||||
import { ActorType, ReportStatusEnum } from "@/types/enums";
|
import { ActorType, ReportStatusEnum } from "@/types/enums";
|
||||||
import RouteName from "../../router/name";
|
import RouteName from "../../router/name";
|
||||||
|
import { GraphQLError } from "graphql";
|
||||||
|
import { ApolloCache, FetchResult, InMemoryCache } from "@apollo/client/core";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
apollo: {
|
apollo: {
|
||||||
@ -313,7 +315,9 @@ import RouteName from "../../router/name";
|
|||||||
};
|
};
|
||||||
},
|
},
|
||||||
error({ graphQLErrors }) {
|
error({ graphQLErrors }) {
|
||||||
this.errors = uniq(graphQLErrors.map(({ message }) => message));
|
this.errors = uniq(
|
||||||
|
graphQLErrors.map(({ message }: GraphQLError) => message)
|
||||||
|
);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
currentActor: {
|
currentActor: {
|
||||||
@ -356,7 +360,7 @@ export default class Report extends Vue {
|
|||||||
reportId: this.report.id,
|
reportId: this.report.id,
|
||||||
content: this.noteContent,
|
content: this.noteContent,
|
||||||
},
|
},
|
||||||
update: (store, { data }) => {
|
update: (store: ApolloCache<InMemoryCache>, { data }: FetchResult) => {
|
||||||
if (data == null) return;
|
if (data == null) return;
|
||||||
const cachedData = store.readQuery<{ report: IReport }>({
|
const cachedData = store.readQuery<{ report: IReport }>({
|
||||||
query: REPORT,
|
query: REPORT,
|
||||||
@ -462,7 +466,7 @@ export default class Report extends Vue {
|
|||||||
reportId: this.report.id,
|
reportId: this.report.id,
|
||||||
status,
|
status,
|
||||||
},
|
},
|
||||||
update: (store, { data }) => {
|
update: (store: ApolloCache<InMemoryCache>, { data }: FetchResult) => {
|
||||||
if (data == null) return;
|
if (data == null) return;
|
||||||
const reportCachedData = store.readQuery<{ report: IReport }>({
|
const reportCachedData = store.readQuery<{ report: IReport }>({
|
||||||
query: REPORT,
|
query: REPORT,
|
||||||
|
@ -17,23 +17,23 @@
|
|||||||
<section>
|
<section>
|
||||||
<b-field>
|
<b-field>
|
||||||
<b-radio-button
|
<b-radio-button
|
||||||
v-model="filterReports"
|
v-model="status"
|
||||||
:native-value="ReportStatusEnum.OPEN"
|
:native-value="ReportStatusEnum.OPEN"
|
||||||
>{{ $t("Open") }}</b-radio-button
|
>{{ $t("Open") }}</b-radio-button
|
||||||
>
|
>
|
||||||
<b-radio-button
|
<b-radio-button
|
||||||
v-model="filterReports"
|
v-model="status"
|
||||||
:native-value="ReportStatusEnum.RESOLVED"
|
:native-value="ReportStatusEnum.RESOLVED"
|
||||||
>{{ $t("Resolved") }}</b-radio-button
|
>{{ $t("Resolved") }}</b-radio-button
|
||||||
>
|
>
|
||||||
<b-radio-button
|
<b-radio-button
|
||||||
v-model="filterReports"
|
v-model="status"
|
||||||
:native-value="ReportStatusEnum.CLOSED"
|
:native-value="ReportStatusEnum.CLOSED"
|
||||||
>{{ $t("Closed") }}</b-radio-button
|
>{{ $t("Closed") }}</b-radio-button
|
||||||
>
|
>
|
||||||
</b-field>
|
</b-field>
|
||||||
<ul v-if="reports.length > 0">
|
<ul v-if="reports.elements.length > 0">
|
||||||
<li v-for="report in reports" :key="report.id">
|
<li v-for="report in reports.elements" :key="report.id">
|
||||||
<router-link
|
<router-link
|
||||||
:to="{ name: RouteName.REPORT, params: { reportId: report.id } }"
|
:to="{ name: RouteName.REPORT, params: { reportId: report.id } }"
|
||||||
>
|
>
|
||||||
@ -41,48 +41,70 @@
|
|||||||
</router-link>
|
</router-link>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<div v-else>
|
<div v-else class="no-reports">
|
||||||
<b-message
|
<empty-content
|
||||||
v-if="filterReports === ReportStatusEnum.OPEN"
|
icon="chat-alert"
|
||||||
type="is-info"
|
inline
|
||||||
|
v-if="status === ReportStatusEnum.OPEN"
|
||||||
>
|
>
|
||||||
{{ $t("No open reports yet") }}
|
{{ $t("No open reports yet") }}
|
||||||
</b-message>
|
</empty-content>
|
||||||
<b-message
|
<empty-content
|
||||||
v-if="filterReports === ReportStatusEnum.RESOLVED"
|
icon="chat-alert"
|
||||||
type="is-info"
|
inline
|
||||||
|
v-if="status === ReportStatusEnum.RESOLVED"
|
||||||
>
|
>
|
||||||
{{ $t("No resolved reports yet") }}
|
{{ $t("No resolved reports yet") }}
|
||||||
</b-message>
|
</empty-content>
|
||||||
<b-message
|
<empty-content
|
||||||
v-if="filterReports === ReportStatusEnum.CLOSED"
|
icon="chat-alert"
|
||||||
type="is-info"
|
inline
|
||||||
|
v-if="status === ReportStatusEnum.CLOSED"
|
||||||
>
|
>
|
||||||
{{ $t("No closed reports yet") }}
|
{{ $t("No closed reports yet") }}
|
||||||
</b-message>
|
</empty-content>
|
||||||
</div>
|
</div>
|
||||||
|
<b-pagination
|
||||||
|
:total="reports.total"
|
||||||
|
v-model="page"
|
||||||
|
:simple="true"
|
||||||
|
:per-page="REPORT_PAGE_LIMIT"
|
||||||
|
:aria-next-label="$t('Next page')"
|
||||||
|
:aria-previous-label="$t('Previous page')"
|
||||||
|
:aria-page-label="$t('Page')"
|
||||||
|
:aria-current-label="$t('Current page')"
|
||||||
|
>
|
||||||
|
</b-pagination>
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Vue, Watch } from "vue-property-decorator";
|
import { Component, Vue } from "vue-property-decorator";
|
||||||
import { IReport } from "@/types/report.model";
|
import { IReport } from "@/types/report.model";
|
||||||
import { REPORTS } from "@/graphql/report";
|
import { REPORTS } from "@/graphql/report";
|
||||||
import ReportCard from "@/components/Report/ReportCard.vue";
|
import ReportCard from "@/components/Report/ReportCard.vue";
|
||||||
|
import EmptyContent from "@/components/Utils/EmptyContent.vue";
|
||||||
import { ReportStatusEnum } from "@/types/enums";
|
import { ReportStatusEnum } from "@/types/enums";
|
||||||
import RouteName from "../../router/name";
|
import RouteName from "../../router/name";
|
||||||
|
import VueRouter from "vue-router";
|
||||||
|
import { Paginate } from "@/types/paginate";
|
||||||
|
const { isNavigationFailure, NavigationFailureType } = VueRouter;
|
||||||
|
|
||||||
|
const REPORT_PAGE_LIMIT = 1;
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {
|
components: {
|
||||||
ReportCard,
|
ReportCard,
|
||||||
|
EmptyContent,
|
||||||
},
|
},
|
||||||
apollo: {
|
apollo: {
|
||||||
reports: {
|
reports: {
|
||||||
query: REPORTS,
|
query: REPORTS,
|
||||||
fetchPolicy: "cache-and-network",
|
|
||||||
variables() {
|
variables() {
|
||||||
return {
|
return {
|
||||||
status: this.filterReports,
|
page: this.page,
|
||||||
|
status: this.status,
|
||||||
|
limit: REPORT_PAGE_LIMIT,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
pollInterval: 120000, // 2 minutes
|
pollInterval: 120000, // 2 minutes
|
||||||
@ -90,7 +112,7 @@ import RouteName from "../../router/name";
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
export default class ReportList extends Vue {
|
export default class ReportList extends Vue {
|
||||||
reports?: IReport[] = [];
|
reports?: Paginate<IReport> = { elements: [], total: 0 };
|
||||||
|
|
||||||
RouteName = RouteName;
|
RouteName = RouteName;
|
||||||
|
|
||||||
@ -98,27 +120,63 @@ export default class ReportList extends Vue {
|
|||||||
|
|
||||||
filterReports: ReportStatusEnum = ReportStatusEnum.OPEN;
|
filterReports: ReportStatusEnum = ReportStatusEnum.OPEN;
|
||||||
|
|
||||||
@Watch("$route.params.filter", { immediate: true })
|
REPORT_PAGE_LIMIT = REPORT_PAGE_LIMIT;
|
||||||
onRouteFilterChanged(val: string): void {
|
|
||||||
if (!val) return;
|
get page(): number {
|
||||||
const filter = val.toUpperCase();
|
return parseInt((this.$route.query.page as string) || "1", 10);
|
||||||
if (filter in ReportStatusEnum) {
|
|
||||||
this.filterReports = filter as ReportStatusEnum;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Watch("filterReports", { immediate: true })
|
set page(page: number) {
|
||||||
async onFilterChanged(val: string): Promise<void> {
|
this.pushRouter(RouteName.REPORTS, {
|
||||||
await this.$router.push({
|
page: page.toString(),
|
||||||
name: RouteName.REPORTS,
|
|
||||||
params: { filter: val.toLowerCase() },
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get status(): ReportStatusEnum {
|
||||||
|
const filter = this.$route.params.filter?.toUpperCase();
|
||||||
|
if (filter in ReportStatusEnum) {
|
||||||
|
return filter as ReportStatusEnum;
|
||||||
|
}
|
||||||
|
return ReportStatusEnum.OPEN;
|
||||||
|
}
|
||||||
|
|
||||||
|
set status(status: ReportStatusEnum) {
|
||||||
|
this.$router.push({
|
||||||
|
name: RouteName.REPORTS,
|
||||||
|
params: { filter: status.toLowerCase() },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
protected async pushRouter(
|
||||||
|
routeName: string,
|
||||||
|
args: Record<string, string>
|
||||||
|
): Promise<void> {
|
||||||
|
try {
|
||||||
|
await this.$router.push({
|
||||||
|
name: routeName,
|
||||||
|
params: this.$route.params,
|
||||||
|
query: { ...this.$route.query, ...args },
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
if (isNavigationFailure(e, NavigationFailureType.redirected)) {
|
||||||
|
throw Error(e.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
section > ul li > a {
|
section {
|
||||||
|
.no-reports {
|
||||||
|
margin-bottom: 2rem;
|
||||||
|
}
|
||||||
|
& > ul li {
|
||||||
|
margin: 0.5rem auto;
|
||||||
|
|
||||||
|
& > a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
@ -229,7 +229,7 @@ import { Component, Mixins, Prop, Watch } from "vue-property-decorator";
|
|||||||
import ResourceItem from "@/components/Resource/ResourceItem.vue";
|
import ResourceItem from "@/components/Resource/ResourceItem.vue";
|
||||||
import FolderItem from "@/components/Resource/FolderItem.vue";
|
import FolderItem from "@/components/Resource/FolderItem.vue";
|
||||||
import Draggable from "vuedraggable";
|
import Draggable from "vuedraggable";
|
||||||
import { RefetchQueryDescription } from "apollo-client/core/watchQueryOptions";
|
import { RefetchQueryDescription } from "@apollo/client/core/watchQueryOptions";
|
||||||
import { CURRENT_ACTOR_CLIENT } from "../../graphql/actor";
|
import { CURRENT_ACTOR_CLIENT } from "../../graphql/actor";
|
||||||
import { IActor, usernameWithDomain } from "../../types/actor";
|
import { IActor, usernameWithDomain } from "../../types/actor";
|
||||||
import RouteName from "../../router/name";
|
import RouteName from "../../router/name";
|
||||||
@ -249,6 +249,7 @@ import { CONFIG } from "../../graphql/config";
|
|||||||
import { IConfig } from "../../types/config.model";
|
import { IConfig } from "../../types/config.model";
|
||||||
import ResourceMixin from "../../mixins/resource";
|
import ResourceMixin from "../../mixins/resource";
|
||||||
import ResourceSelector from "../../components/Resource/ResourceSelector.vue";
|
import ResourceSelector from "../../components/Resource/ResourceSelector.vue";
|
||||||
|
import { ApolloCache, FetchResult, InMemoryCache } from "@apollo/client/core";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: { FolderItem, ResourceItem, Draggable, ResourceSelector },
|
components: { FolderItem, ResourceItem, Draggable, ResourceSelector },
|
||||||
@ -538,7 +539,7 @@ export default class Resources extends Mixins(ResourceMixin) {
|
|||||||
path: resource.path,
|
path: resource.path,
|
||||||
},
|
},
|
||||||
refetchQueries: () => this.postRefreshQueries(),
|
refetchQueries: () => this.postRefreshQueries(),
|
||||||
update: (store, { data }) => {
|
update: (store: ApolloCache<InMemoryCache>, { data }: FetchResult) => {
|
||||||
if (!data || data.updateResource == null || parentPath == null)
|
if (!data || data.updateResource == null || parentPath == null)
|
||||||
return;
|
return;
|
||||||
if (!this.resource.actor) return;
|
if (!this.resource.actor) return;
|
||||||
|
@ -51,6 +51,7 @@ import { CURRENT_ACTOR_CLIENT } from "@/graphql/actor";
|
|||||||
import { IActor } from "@/types/actor";
|
import { IActor } from "@/types/actor";
|
||||||
import { ITodoList } from "@/types/todolist";
|
import { ITodoList } from "@/types/todolist";
|
||||||
import RouteName from "../../router/name";
|
import RouteName from "../../router/name";
|
||||||
|
import { ApolloCache, FetchResult, InMemoryCache } from "@apollo/client/core";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {
|
components: {
|
||||||
@ -88,7 +89,7 @@ export default class TodoList extends Vue {
|
|||||||
status: this.newTodo.status,
|
status: this.newTodo.status,
|
||||||
todoListId: this.id,
|
todoListId: this.id,
|
||||||
},
|
},
|
||||||
update: (store, { data }) => {
|
update: (store: ApolloCache<InMemoryCache>, { data }: FetchResult) => {
|
||||||
if (data == null) return;
|
if (data == null) return;
|
||||||
const cachedData = store.readQuery<{ todoList: ITodoList }>({
|
const cachedData = store.readQuery<{ todoList: ITodoList }>({
|
||||||
query: FETCH_TODO_LIST,
|
query: FETCH_TODO_LIST,
|
||||||
|
@ -1,14 +1,16 @@
|
|||||||
import Vue from "vue";
|
import Vue from "vue";
|
||||||
import VueApollo from "vue-apollo";
|
import VueApollo from "vue-apollo";
|
||||||
import { ApolloLink, Observable, split } from "apollo-link";
|
import { onError } from "@apollo/client/link/error";
|
||||||
|
import { createLink } from "apollo-absinthe-upload-link";
|
||||||
import {
|
import {
|
||||||
|
ApolloClient,
|
||||||
|
ApolloLink,
|
||||||
defaultDataIdFromObject,
|
defaultDataIdFromObject,
|
||||||
InMemoryCache,
|
InMemoryCache,
|
||||||
NormalizedCacheObject,
|
NormalizedCacheObject,
|
||||||
} from "apollo-cache-inmemory";
|
Observable,
|
||||||
import { onError } from "apollo-link-error";
|
split,
|
||||||
import { createLink } from "apollo-absinthe-upload-link";
|
} from "@apollo/client/core";
|
||||||
import { ApolloClient } from "apollo-client";
|
|
||||||
import buildCurrentUserResolver from "@/apollo/user";
|
import buildCurrentUserResolver from "@/apollo/user";
|
||||||
import { isServerError } from "@/types/apollo";
|
import { isServerError } from "@/types/apollo";
|
||||||
import { AUTH_ACCESS_TOKEN } from "@/constants";
|
import { AUTH_ACCESS_TOKEN } from "@/constants";
|
||||||
@ -16,10 +18,14 @@ import { logout } from "@/utils/auth";
|
|||||||
import { Socket as PhoenixSocket } from "phoenix";
|
import { Socket as PhoenixSocket } from "phoenix";
|
||||||
import * as AbsintheSocket from "@absinthe/socket";
|
import * as AbsintheSocket from "@absinthe/socket";
|
||||||
import { createAbsintheSocketLink } from "@absinthe/socket-apollo-link";
|
import { createAbsintheSocketLink } from "@absinthe/socket-apollo-link";
|
||||||
import { getMainDefinition } from "apollo-utilities";
|
import { getMainDefinition } from "@apollo/client/utilities";
|
||||||
import fetch from "unfetch";
|
import fetch from "unfetch";
|
||||||
import { GRAPHQL_API_ENDPOINT, GRAPHQL_API_FULL_PATH } from "./api/_entrypoint";
|
import { GRAPHQL_API_ENDPOINT, GRAPHQL_API_FULL_PATH } from "./api/_entrypoint";
|
||||||
import { fragmentMatcher, refreshAccessToken } from "./apollo/utils";
|
import {
|
||||||
|
possibleTypes,
|
||||||
|
typePolicies,
|
||||||
|
refreshAccessToken,
|
||||||
|
} from "./apollo/utils";
|
||||||
|
|
||||||
// Install the vue plugin
|
// Install the vue plugin
|
||||||
Vue.use(VueApollo);
|
Vue.use(VueApollo);
|
||||||
@ -89,7 +95,7 @@ const errorLink = onError(
|
|||||||
({ graphQLErrors, networkError, forward, operation }) => {
|
({ graphQLErrors, networkError, forward, operation }) => {
|
||||||
if (
|
if (
|
||||||
isServerError(networkError) &&
|
isServerError(networkError) &&
|
||||||
networkError.statusCode === 401 &&
|
networkError?.statusCode === 401 &&
|
||||||
!alreadyRefreshedToken
|
!alreadyRefreshedToken
|
||||||
) {
|
) {
|
||||||
if (!refreshingTokenPromise)
|
if (!refreshingTokenPromise)
|
||||||
@ -130,7 +136,8 @@ const errorLink = onError(
|
|||||||
const fullLink = authMiddleware.concat(errorLink).concat(link);
|
const fullLink = authMiddleware.concat(errorLink).concat(link);
|
||||||
|
|
||||||
const cache = new InMemoryCache({
|
const cache = new InMemoryCache({
|
||||||
fragmentMatcher,
|
typePolicies,
|
||||||
|
possibleTypes,
|
||||||
dataIdFromObject: (object: any) => {
|
dataIdFromObject: (object: any) => {
|
||||||
if (object.__typename === "Address") {
|
if (object.__typename === "Address") {
|
||||||
return object.origin_id;
|
return object.origin_id;
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
import { config, createLocalVue, shallowMount, Wrapper } from "@vue/test-utils";
|
import { config, createLocalVue, shallowMount, Wrapper } from "@vue/test-utils";
|
||||||
import CommentTree from "@/components/Comment/CommentTree.vue";
|
import CommentTree from "@/components/Comment/CommentTree.vue";
|
||||||
import Buefy from "buefy";
|
import Buefy from "buefy";
|
||||||
import { InMemoryCache } from "apollo-cache-inmemory";
|
|
||||||
import {
|
import {
|
||||||
createMockClient,
|
createMockClient,
|
||||||
MockApolloClient,
|
MockApolloClient,
|
||||||
@ -17,6 +16,7 @@ import {
|
|||||||
newCommentForEventMock,
|
newCommentForEventMock,
|
||||||
newCommentForEventResponse,
|
newCommentForEventResponse,
|
||||||
} from "../../mocks/event";
|
} from "../../mocks/event";
|
||||||
|
import { InMemoryCache } from "@apollo/client/cache";
|
||||||
|
|
||||||
const localVue = createLocalVue();
|
const localVue = createLocalVue();
|
||||||
localVue.use(Buefy);
|
localVue.use(Buefy);
|
||||||
|
@ -10,10 +10,10 @@ import {
|
|||||||
RequestHandler,
|
RequestHandler,
|
||||||
} from "mock-apollo-client";
|
} from "mock-apollo-client";
|
||||||
import buildCurrentUserResolver from "@/apollo/user";
|
import buildCurrentUserResolver from "@/apollo/user";
|
||||||
import { InMemoryCache } from "apollo-cache-inmemory";
|
|
||||||
import { CONFIG } from "@/graphql/config";
|
import { CONFIG } from "@/graphql/config";
|
||||||
import VueApollo from "vue-apollo";
|
import VueApollo from "vue-apollo";
|
||||||
import { configMock } from "../../mocks/config";
|
import { configMock } from "../../mocks/config";
|
||||||
|
import { InMemoryCache } from "@apollo/client/cache";
|
||||||
|
|
||||||
const localVue = createLocalVue();
|
const localVue = createLocalVue();
|
||||||
localVue.use(Buefy);
|
localVue.use(Buefy);
|
||||||
|
@ -14,7 +14,6 @@ import {
|
|||||||
RequestHandler,
|
RequestHandler,
|
||||||
} from "mock-apollo-client";
|
} from "mock-apollo-client";
|
||||||
import buildCurrentUserResolver from "@/apollo/user";
|
import buildCurrentUserResolver from "@/apollo/user";
|
||||||
import { InMemoryCache } from "apollo-cache-inmemory";
|
|
||||||
import { CONFIG } from "@/graphql/config";
|
import { CONFIG } from "@/graphql/config";
|
||||||
import VueApollo from "vue-apollo";
|
import VueApollo from "vue-apollo";
|
||||||
import { FETCH_EVENT_BASIC, JOIN_EVENT } from "@/graphql/event";
|
import { FETCH_EVENT_BASIC, JOIN_EVENT } from "@/graphql/event";
|
||||||
@ -26,6 +25,7 @@ import {
|
|||||||
joinEventMock,
|
joinEventMock,
|
||||||
joinEventResponseMock,
|
joinEventResponseMock,
|
||||||
} from "../../mocks/event";
|
} from "../../mocks/event";
|
||||||
|
import { InMemoryCache } from "@apollo/client/cache";
|
||||||
|
|
||||||
const localVue = createLocalVue();
|
const localVue = createLocalVue();
|
||||||
localVue.use(Buefy);
|
localVue.use(Buefy);
|
||||||
|
@ -8,7 +8,6 @@ import {
|
|||||||
} from "mock-apollo-client";
|
} from "mock-apollo-client";
|
||||||
import VueApollo from "vue-apollo";
|
import VueApollo from "vue-apollo";
|
||||||
import buildCurrentUserResolver from "@/apollo/user";
|
import buildCurrentUserResolver from "@/apollo/user";
|
||||||
import { InMemoryCache } from "apollo-cache-inmemory";
|
|
||||||
import { configMock } from "../../mocks/config";
|
import { configMock } from "../../mocks/config";
|
||||||
import { i18n } from "@/utils/i18n";
|
import { i18n } from "@/utils/i18n";
|
||||||
import { CONFIG } from "@/graphql/config";
|
import { CONFIG } from "@/graphql/config";
|
||||||
@ -18,6 +17,7 @@ import { CURRENT_USER_CLIENT } from "@/graphql/user";
|
|||||||
import { ICurrentUser } from "@/types/current-user.model";
|
import { ICurrentUser } from "@/types/current-user.model";
|
||||||
import flushPromises from "flush-promises";
|
import flushPromises from "flush-promises";
|
||||||
import RouteName from "@/router/name";
|
import RouteName from "@/router/name";
|
||||||
|
import { InMemoryCache } from "@apollo/client/cache";
|
||||||
|
|
||||||
const localVue = createLocalVue();
|
const localVue = createLocalVue();
|
||||||
localVue.use(Buefy);
|
localVue.use(Buefy);
|
||||||
|
@ -8,10 +8,10 @@ import {
|
|||||||
import VueApollo from "vue-apollo";
|
import VueApollo from "vue-apollo";
|
||||||
import { CONFIG } from "@/graphql/config";
|
import { CONFIG } from "@/graphql/config";
|
||||||
import { USER_SETTINGS } from "@/graphql/user";
|
import { USER_SETTINGS } from "@/graphql/user";
|
||||||
import { InMemoryCache } from "apollo-cache-inmemory";
|
|
||||||
import buildCurrentUserResolver from "@/apollo/user";
|
import buildCurrentUserResolver from "@/apollo/user";
|
||||||
import Buefy from "buefy";
|
import Buefy from "buefy";
|
||||||
import { configMock } from "../mocks/config";
|
import { configMock } from "../mocks/config";
|
||||||
|
import { InMemoryCache } from "@apollo/client/cache";
|
||||||
|
|
||||||
const localVue = createLocalVue();
|
const localVue = createLocalVue();
|
||||||
localVue.use(VueApollo);
|
localVue.use(VueApollo);
|
||||||
|
111
js/yarn.lock
111
js/yarn.lock
@ -27,7 +27,7 @@
|
|||||||
core-js "2.6.0"
|
core-js "2.6.0"
|
||||||
zen-observable "0.8.11"
|
zen-observable "0.8.11"
|
||||||
|
|
||||||
"@apollo/client@^3.0.0":
|
"@apollo/client@^3.0.0", "@apollo/client@^3.3.16":
|
||||||
version "3.3.19"
|
version "3.3.19"
|
||||||
resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.3.19.tgz#f1172dc9b9d7eae04c8940b047fd3b452ef92d2c"
|
resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.3.19.tgz#f1172dc9b9d7eae04c8940b047fd3b452ef92d2c"
|
||||||
integrity sha512-vzljWLPP0GwocfBhUopzDCUwsiaNTtii1eu8qDybAXqwj4/ZhnIM46c6dNQmnVcJpAIFRIsNCOxM4OlMDySJug==
|
integrity sha512-vzljWLPP0GwocfBhUopzDCUwsiaNTtii1eu8qDybAXqwj4/ZhnIM46c6dNQmnVcJpAIFRIsNCOxM4OlMDySJug==
|
||||||
@ -1906,7 +1906,7 @@
|
|||||||
resolved "https://registry.yarnpkg.com/@types/ngeohash/-/ngeohash-0.6.2.tgz#356bb5e79294bc9f746ad89eb848eca2741a6e43"
|
resolved "https://registry.yarnpkg.com/@types/ngeohash/-/ngeohash-0.6.2.tgz#356bb5e79294bc9f746ad89eb848eca2741a6e43"
|
||||||
integrity sha512-6nlq2eEh75JegDGUXis9wGTYIJpUvbori4qx++PRKQsV3YRkaqUNPNykzphniqPSZADXCouBuAnyptjUkMkhvw==
|
integrity sha512-6nlq2eEh75JegDGUXis9wGTYIJpUvbori4qx++PRKQsV3YRkaqUNPNykzphniqPSZADXCouBuAnyptjUkMkhvw==
|
||||||
|
|
||||||
"@types/node@*", "@types/node@>=6":
|
"@types/node@*":
|
||||||
version "15.3.0"
|
version "15.3.0"
|
||||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-15.3.0.tgz#d6fed7d6bc6854306da3dea1af9f874b00783e26"
|
resolved "https://registry.yarnpkg.com/@types/node/-/node-15.3.0.tgz#d6fed7d6bc6854306da3dea1af9f874b00783e26"
|
||||||
integrity sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==
|
integrity sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==
|
||||||
@ -2746,14 +2746,6 @@
|
|||||||
resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz#f84fd07bcacefe56ce762925798871092f0f228e"
|
resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz#f84fd07bcacefe56ce762925798871092f0f228e"
|
||||||
integrity sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==
|
integrity sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==
|
||||||
|
|
||||||
"@wry/context@^0.4.0":
|
|
||||||
version "0.4.4"
|
|
||||||
resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.4.4.tgz#e50f5fa1d6cfaabf2977d1fda5ae91717f8815f8"
|
|
||||||
integrity sha512-LrKVLove/zw6h2Md/KZyWxIkFM6AoyKp71OqpH9Hiip1csjPVoD3tPxlbQUNxEnHENks3UGgNpSBCAfq9KWuag==
|
|
||||||
dependencies:
|
|
||||||
"@types/node" ">=6"
|
|
||||||
tslib "^1.9.3"
|
|
||||||
|
|
||||||
"@wry/context@^0.6.0":
|
"@wry/context@^0.6.0":
|
||||||
version "0.6.0"
|
version "0.6.0"
|
||||||
resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.6.0.tgz#f903eceb89d238ef7e8168ed30f4511f92d83e06"
|
resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.6.0.tgz#f903eceb89d238ef7e8168ed30f4511f92d83e06"
|
||||||
@ -2984,74 +2976,6 @@ apollo-absinthe-upload-link@^1.5.0:
|
|||||||
graphql "^15.0.0"
|
graphql "^15.0.0"
|
||||||
rxjs "~6.2.2"
|
rxjs "~6.2.2"
|
||||||
|
|
||||||
apollo-cache-inmemory@^1.6.6:
|
|
||||||
version "1.6.6"
|
|
||||||
resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.6.tgz#56d1f2a463a6b9db32e9fa990af16d2a008206fd"
|
|
||||||
integrity sha512-L8pToTW/+Xru2FFAhkZ1OA9q4V4nuvfoPecBM34DecAugUZEBhI2Hmpgnzq2hTKZ60LAMrlqiASm0aqAY6F8/A==
|
|
||||||
dependencies:
|
|
||||||
apollo-cache "^1.3.5"
|
|
||||||
apollo-utilities "^1.3.4"
|
|
||||||
optimism "^0.10.0"
|
|
||||||
ts-invariant "^0.4.0"
|
|
||||||
tslib "^1.10.0"
|
|
||||||
|
|
||||||
apollo-cache@1.3.5, apollo-cache@^1.3.5:
|
|
||||||
version "1.3.5"
|
|
||||||
resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.5.tgz#9dbebfc8dbe8fe7f97ba568a224bca2c5d81f461"
|
|
||||||
integrity sha512-1XoDy8kJnyWY/i/+gLTEbYLnoiVtS8y7ikBr/IfmML4Qb+CM7dEEbIUOjnY716WqmZ/UpXIxTfJsY7rMcqiCXA==
|
|
||||||
dependencies:
|
|
||||||
apollo-utilities "^1.3.4"
|
|
||||||
tslib "^1.10.0"
|
|
||||||
|
|
||||||
apollo-client@^2.6.10:
|
|
||||||
version "2.6.10"
|
|
||||||
resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.10.tgz#86637047b51d940c8eaa771a4ce1b02df16bea6a"
|
|
||||||
integrity sha512-jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA==
|
|
||||||
dependencies:
|
|
||||||
"@types/zen-observable" "^0.8.0"
|
|
||||||
apollo-cache "1.3.5"
|
|
||||||
apollo-link "^1.0.0"
|
|
||||||
apollo-utilities "1.3.4"
|
|
||||||
symbol-observable "^1.0.2"
|
|
||||||
ts-invariant "^0.4.0"
|
|
||||||
tslib "^1.10.0"
|
|
||||||
zen-observable "^0.8.0"
|
|
||||||
|
|
||||||
apollo-link-error@^1.1.13:
|
|
||||||
version "1.1.13"
|
|
||||||
resolved "https://registry.yarnpkg.com/apollo-link-error/-/apollo-link-error-1.1.13.tgz#c1a1bb876ffe380802c8df0506a32c33aad284cd"
|
|
||||||
integrity sha512-jAZOOahJU6bwSqb2ZyskEK1XdgUY9nkmeclCrW7Gddh1uasHVqmoYc4CKdb0/H0Y1J9lvaXKle2Wsw/Zx1AyUg==
|
|
||||||
dependencies:
|
|
||||||
apollo-link "^1.2.14"
|
|
||||||
apollo-link-http-common "^0.2.16"
|
|
||||||
tslib "^1.9.3"
|
|
||||||
|
|
||||||
apollo-link-http-common@^0.2.16:
|
|
||||||
version "0.2.16"
|
|
||||||
resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.16.tgz#756749dafc732792c8ca0923f9a40564b7c59ecc"
|
|
||||||
integrity sha512-2tIhOIrnaF4UbQHf7kjeQA/EmSorB7+HyJIIrUjJOKBgnXwuexi8aMecRlqTIDWcyVXCeqLhUnztMa6bOH/jTg==
|
|
||||||
dependencies:
|
|
||||||
apollo-link "^1.2.14"
|
|
||||||
ts-invariant "^0.4.0"
|
|
||||||
tslib "^1.9.3"
|
|
||||||
|
|
||||||
apollo-link-http@^1.5.17:
|
|
||||||
version "1.5.17"
|
|
||||||
resolved "https://registry.yarnpkg.com/apollo-link-http/-/apollo-link-http-1.5.17.tgz#499e9f1711bf694497f02c51af12d82de5d8d8ba"
|
|
||||||
integrity sha512-uWcqAotbwDEU/9+Dm9e1/clO7hTB2kQ/94JYcGouBVLjoKmTeJTUPQKcJGpPwUjZcSqgYicbFqQSoJIW0yrFvg==
|
|
||||||
dependencies:
|
|
||||||
apollo-link "^1.2.14"
|
|
||||||
apollo-link-http-common "^0.2.16"
|
|
||||||
tslib "^1.9.3"
|
|
||||||
|
|
||||||
apollo-link-ws@^1.0.19:
|
|
||||||
version "1.0.20"
|
|
||||||
resolved "https://registry.yarnpkg.com/apollo-link-ws/-/apollo-link-ws-1.0.20.tgz#dfad44121f8445c6d7b7f8101a1b24813ba008ed"
|
|
||||||
integrity sha512-mjSFPlQxmoLArpHBeUb2Xj+2HDYeTaJqFGOqQ+I8NVJxgL9lJe84PDWcPah/yMLv3rB7QgBDSuZ0xoRFBPlySw==
|
|
||||||
dependencies:
|
|
||||||
apollo-link "^1.2.14"
|
|
||||||
tslib "^1.9.3"
|
|
||||||
|
|
||||||
apollo-link@1.2.5:
|
apollo-link@1.2.5:
|
||||||
version "1.2.5"
|
version "1.2.5"
|
||||||
resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.5.tgz#f54932d6b8f1412a35e088bc199a116bce3f1f16"
|
resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.5.tgz#f54932d6b8f1412a35e088bc199a116bce3f1f16"
|
||||||
@ -3060,17 +2984,7 @@ apollo-link@1.2.5:
|
|||||||
apollo-utilities "^1.0.0"
|
apollo-utilities "^1.0.0"
|
||||||
zen-observable-ts "^0.8.12"
|
zen-observable-ts "^0.8.12"
|
||||||
|
|
||||||
apollo-link@^1.0.0, apollo-link@^1.2.14:
|
apollo-utilities@^1.0.0:
|
||||||
version "1.2.14"
|
|
||||||
resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.14.tgz#3feda4b47f9ebba7f4160bef8b977ba725b684d9"
|
|
||||||
integrity sha512-p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg==
|
|
||||||
dependencies:
|
|
||||||
apollo-utilities "^1.3.0"
|
|
||||||
ts-invariant "^0.4.0"
|
|
||||||
tslib "^1.9.3"
|
|
||||||
zen-observable-ts "^0.8.21"
|
|
||||||
|
|
||||||
apollo-utilities@1.3.4, apollo-utilities@^1.0.0, apollo-utilities@^1.3.0, apollo-utilities@^1.3.2, apollo-utilities@^1.3.4:
|
|
||||||
version "1.3.4"
|
version "1.3.4"
|
||||||
resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.4.tgz#6129e438e8be201b6c55b0f13ce49d2c7175c9cf"
|
resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.4.tgz#6129e438e8be201b6c55b0f13ce49d2c7175c9cf"
|
||||||
integrity sha512-pk2hiWrCXMAy2fRPwEyhvka+mqwzeP60Jr1tRYi5xru+3ko94HI9o6lK0CT33/w4RDlxWchmdhDCrvdr+pHCig==
|
integrity sha512-pk2hiWrCXMAy2fRPwEyhvka+mqwzeP60Jr1tRYi5xru+3ko94HI9o6lK0CT33/w4RDlxWchmdhDCrvdr+pHCig==
|
||||||
@ -8182,10 +8096,10 @@ mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1:
|
|||||||
dependencies:
|
dependencies:
|
||||||
minimist "^1.2.5"
|
minimist "^1.2.5"
|
||||||
|
|
||||||
mock-apollo-client@^0.6:
|
mock-apollo-client@^1.1.0:
|
||||||
version "0.6.0"
|
version "1.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-0.6.0.tgz#ff1760f18798789931e421c6668bfc0e7f1f0649"
|
resolved "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-1.1.0.tgz#0589ae458a2539518e870bb0c08961f30a9eaec1"
|
||||||
integrity sha512-HPo6yVkAE+uxIpB8oPO9ISM86hFDwefrHKz5uOowecT/hR79e/NbXAl372LOQ1lWYVNVgCaP3RIMgWEhVFWtjw==
|
integrity sha512-OXCvwAwwHbieMMipcE3wGdPONPHC+f65EEiyC1XpYaS5Jk6/c7oBe9t8knwzAqyCQ9nZziHdR8UDqORPTfkcFw==
|
||||||
|
|
||||||
module-alias@^2.2.2:
|
module-alias@^2.2.2:
|
||||||
version "2.2.2"
|
version "2.2.2"
|
||||||
@ -8578,13 +8492,6 @@ opn@^5.5.0:
|
|||||||
dependencies:
|
dependencies:
|
||||||
is-wsl "^1.1.0"
|
is-wsl "^1.1.0"
|
||||||
|
|
||||||
optimism@^0.10.0:
|
|
||||||
version "0.10.3"
|
|
||||||
resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.10.3.tgz#163268fdc741dea2fb50f300bedda80356445fd7"
|
|
||||||
integrity sha512-9A5pqGoQk49H6Vhjb9kPgAeeECfUDF6aIICbMDL23kDLStBn1MWk3YvcZ4xWF9CsSf6XEgvRLkXy4xof/56vVw==
|
|
||||||
dependencies:
|
|
||||||
"@wry/context" "^0.4.0"
|
|
||||||
|
|
||||||
optimism@^0.16.0:
|
optimism@^0.16.0:
|
||||||
version "0.16.1"
|
version "0.16.1"
|
||||||
resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.16.1.tgz#7c8efc1f3179f18307b887e18c15c5b7133f6e7d"
|
resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.16.1.tgz#7c8efc1f3179f18307b887e18c15c5b7133f6e7d"
|
||||||
@ -10907,7 +10814,7 @@ svgo@^2.3.0:
|
|||||||
csso "^4.2.0"
|
csso "^4.2.0"
|
||||||
stable "^0.1.8"
|
stable "^0.1.8"
|
||||||
|
|
||||||
symbol-observable@^1.0.2, symbol-observable@^1.1.0:
|
symbol-observable@^1.1.0:
|
||||||
version "1.2.0"
|
version "1.2.0"
|
||||||
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
|
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
|
||||||
integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
|
integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
|
||||||
@ -12449,7 +12356,7 @@ yorkie@^2.0.0:
|
|||||||
normalize-path "^1.0.0"
|
normalize-path "^1.0.0"
|
||||||
strip-indent "^2.0.0"
|
strip-indent "^2.0.0"
|
||||||
|
|
||||||
zen-observable-ts@^0.8.12, zen-observable-ts@^0.8.21:
|
zen-observable-ts@^0.8.12:
|
||||||
version "0.8.21"
|
version "0.8.21"
|
||||||
resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz#85d0031fbbde1eba3cd07d3ba90da241215f421d"
|
resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz#85d0031fbbde1eba3cd07d3ba90da241215f421d"
|
||||||
integrity sha512-Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg==
|
integrity sha512-Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg==
|
||||||
|
Loading…
Reference in New Issue
Block a user