From 559c922fa137f4188135b0bb20feca0497fd97b3 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 16 Dec 2019 16:48:38 +0100 Subject: [PATCH 1/3] Fix issue with child comments not showing up in production mode Signed-off-by: Thomas Citharel --- js/src/components/Comment/Comment.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/js/src/components/Comment/Comment.vue b/js/src/components/Comment/Comment.vue index d9ee1207..36fa3c5b 100644 --- a/js/src/components/Comment/Comment.vue +++ b/js/src/components/Comment/Comment.vue @@ -116,7 +116,7 @@ import { CREATE_REPORT } from '@/graphql/report'; }, components: { editor: () => import(/* webpackChunkName: "editor" */ '@/components/Editor.vue'), - Comment, + comment: () => import(/* webpackChunkName: "comment" */ './Comment.vue'), }, }) export default class Comment extends Vue { @@ -223,7 +223,6 @@ export default class Comment extends Vue { } reportModal() { - console.log('report modal'); this.$buefy.modal.open({ parent: this, component: ReportModal, From bf9a2a4ac00a035ad7f72bc0f86d8059c9274e6b Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 16 Dec 2019 16:49:13 +0100 Subject: [PATCH 2/3] Add domain to GraphQL calls on actors where it was missing and pertinent Signed-off-by: Thomas Citharel --- js/src/graphql/event.ts | 1 + js/src/graphql/report.ts | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/js/src/graphql/event.ts b/js/src/graphql/event.ts index e3ca2033..9f192d56 100644 --- a/js/src/graphql/event.ts +++ b/js/src/graphql/event.ts @@ -171,6 +171,7 @@ export const FETCH_EVENTS = gql` url }, preferredUsername, + domain, name, }, # attributedTo { diff --git a/js/src/graphql/report.ts b/js/src/graphql/report.ts index 6973ca62..3e4f4f96 100644 --- a/js/src/graphql/report.ts +++ b/js/src/graphql/report.ts @@ -7,6 +7,7 @@ export const REPORTS = gql` reported { id, preferredUsername, + domain, name, avatar { url @@ -46,7 +47,8 @@ const REPORT_FRAGMENT = gql` name, avatar { url - } + }, + domain }, reporter { id, @@ -74,6 +76,7 @@ const REPORT_FRAGMENT = gql` actor { id, preferredUsername, + domain, name, avatar { url From 0750f064847eba9ac4b5fd9694b0bc4ffcea8e0e Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 16 Dec 2019 16:49:39 +0100 Subject: [PATCH 3/3] Remove mkdocs-git-revision-date-localized-plugin hack in CI And rebuild docker image with new version See https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/issues/3 Signed-off-by: Thomas Citharel --- .gitlab-ci.yml | 2 -- docker/tests/Dockerfile | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 189ef2f9..aeff996b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,8 +107,6 @@ pages: stage: deploy script: - mkdir public - # We use Python 3.5 in the current Stretch-based image. See https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/issues/3 - - sed -i "s+print(f\"WARNING - plugin locale setting '{plugin_locale}' will overwrite mkdocs locale '{mkdocs_locale}'\")+print(\"WARNING - plugin locale setting will overwrite mkdocs locale\")+g" /usr/local/lib/python3.5/dist-packages/mkdocs_git_revision_date_localized_plugin/plugin.py - mkdocs build - mv site/* public/ - mix deps.get diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index 767f5247..f70520a4 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -1,7 +1,7 @@ FROM elixir:latest LABEL maintainer="Thomas Citharel " -ENV REFRESHED_AT=2019-12-15 +ENV REFRESHED_AT=2019-12-16 RUN apt-get update -yq && apt-get install -yq build-essential inotify-tools postgresql-client git curl gnupg xvfb libgtk-3-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 python3-pip RUN curl -sL https://deb.nodesource.com/setup_10.x | bash && apt-get install nodejs -yq RUN npm install -g yarn wait-on