Merge branch 'dializer' into 'master'

Various typespec and compilation improvements

See merge request framasoft/mobilizon!1062

js/src/components/Event/TagInput.vue

@@ -29,19 +29,28 @@
 </template>
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-property-decorator";
-import get from "lodash/get";
 import differenceBy from "lodash/differenceBy";
 import { ITag } from "../../types/tag.model";
+import { FILTER_TAGS } from "@/graphql/tags";
 
-@Component
+@Component({
+  apollo: {
+    tags: {
+      query: FILTER_TAGS,
+      variables() {
+        return {
+          filter: this.text,
+        };
+      },
+    },
+  },
+})
 export default class TagInput extends Vue {
-  @Prop({ required: false, default: () => [] }) data!: ITag[];
-
-  @Prop({ required: true, default: "value" }) path!: string;
-
   @Prop({ required: true }) value!: ITag[];
 
-  filteredTags: ITag[] = [];
+  tags!: ITag[];
+
+  text = "";
 
   private static componentId = 0;
 
@@ -53,13 +62,20 @@ export default class TagInput extends Vue {
     return `tag-input-${TagInput.componentId}`;
   }
 
-  getFilteredTags(text: string): void {
-    this.filteredTags = differenceBy(this.data, this.value, "id").filter(
+  async getFilteredTags(text: string): Promise<void> {
+    this.text = text;
+    await this.$apollo.queries.tags.refetch();
+  }
+
+  get filteredTags(): ITag[] {
+    return differenceBy(this.tags, this.value, "id").filter(
       (option) =>
-        get(option, this.path)
+        option.title
           .toString()
           .toLowerCase()
-          .indexOf(text.toLowerCase()) >= 0
+          .indexOf(this.text.toLowerCase()) >= 0 ||
+        option.slug.toString().toLowerCase().indexOf(this.text.toLowerCase()) >=
+          0
     );
   }
 

js/src/graphql/tags.ts

@@ -9,16 +9,22 @@ export const TAG_FRAGMENT = gql`
 `;
 
 export const TAGS = gql`
-  query {
+  query Tags {
     tags {
-      id
       related {
-        id
-        slug
-        title
+        ...TagFragment
       }
-      slug
-      title
+      ...TagFragment
     }
   }
+  ${TAG_FRAGMENT}
+`;
+
+export const FILTER_TAGS = gql`
+  query FilterTags($filter: String) {
+    tags(filter: $filter) {
+      ...TagFragment
+    }
+  }
+  ${TAG_FRAGMENT}
 `;

js/src/i18n/es.json

@@ -21,7 +21,6 @@
   "A discussion has been created or updated": "Se ha creado o actualizado una discusión",
   "A federated software": "Un software federado",
   "A fediverse account URL to follow for event updates": "Una URL de cuenta de fediverse a seguir para actualizaciones de eventos",
-  "A group with this name already exists": "Ya existe un grupo con este nombre",
   "A link to a page presenting the event schedule": "Un enlace a una página que presenta el calendario del evento",
   "A link to a page presenting the price options": "Un enlace a una página que presenta las opciones de precio",
   "A member has been updated": "Un miembro ha sido actualizado",

js/src/i18n/fr_FR.json

@@ -19,7 +19,6 @@
   "A discussion has been created or updated": "Une discussion a été créée ou mise à jour",
   "A federated software": "Un logiciel fédéré",
   "A fediverse account URL to follow for event updates": "Un compte sur le fediverse à suivre pour les mises à jour de l'événement",
-  "A group with this name already exists": "Un groupe avec ce nom existe déjà",
   "A link to a page presenting the event schedule": "Un lien vers une page présentant le programme de l'événement",
   "A link to a page presenting the price options": "Un lien vers une page présentant la tarification",
   "A member has been updated": "Un membre a été mis à jour",

js/src/views/Event/Edit.vue

@@ -31,7 +31,7 @@
           />
         </b-field>
 
-        <tag-input v-model="event.tags" :data="tags" path="title" />
+        <tag-input v-model="event.tags" />
 
         <b-field
           horizontal
@@ -556,8 +556,6 @@ import {
   IPerson,
   usernameWithDomain,
 } from "../../types/actor";
-import { TAGS } from "../../graphql/tags";
-import { ITag } from "../../types/tag.model";
 import {
   buildFileFromIMedia,
   buildFileVariable,
@@ -590,7 +588,6 @@ const DEFAULT_LIMIT_NUMBER_OF_PLACES = 10;
   },
   apollo: {
     currentActor: CURRENT_ACTOR_CLIENT,
-    tags: TAGS,
     config: CONFIG,
     identities: IDENTITIES,
     event: {
@@ -643,8 +640,6 @@ export default class EditEvent extends Vue {
 
   currentActor!: IActor;
 
-  tags: ITag[] = [];
-
   event: IEvent = new EventModel();
 
   unmodifiedEvent: IEvent = new EventModel();

js/src/views/Posts/Edit.vue

@@ -67,7 +67,7 @@
           />
         </b-field>
 
-        <tag-input v-model="editablePost.tags" :data="tags" path="title" />
+        <tag-input v-model="editablePost.tags" />
 
         <div class="field">
           <label class="label">{{ $t("Post") }}</label>
@@ -166,7 +166,6 @@ import {
 } from "@/utils/image";
 import GroupMixin from "@/mixins/group";
 import { PostVisibility } from "@/types/enums";
-import { TAGS } from "../../graphql/tags";
 import { CONFIG } from "../../graphql/config";
 import {
   FETCH_POST,
@@ -187,7 +186,6 @@ import { FETCH_GROUP } from "@/graphql/group";
 
 @Component({
   apollo: {
-    tags: TAGS,
     config: CONFIG,
     group: {
       query: FETCH_GROUP,

js/src/views/Settings/AccountSettings.vue

@@ -320,6 +320,8 @@ export default class AccountSettings extends Vue {
         },
       });
 
+      this.oldPassword = "";
+      this.newPassword = "";
       this.$notifier.success(
         this.$t("The password was successfully changed") as string
       );