From 3da846cdf9b52c66903936d9ebdd3306a16d009e Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 26 Nov 2021 14:46:25 +0100
Subject: [PATCH] Always show the cancelled status of an event

Closes #959

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 .../components/Event/EventMinimalistCard.vue  | 18 ++++++++++++++++-
 .../Event/EventParticipationCard.vue          | 20 ++++++++++++++++++-
 js/src/graphql/actor.ts                       |  4 ++++
 js/src/graphql/event.ts                       |  2 ++
 js/src/graphql/group.ts                       |  2 ++
 js/src/graphql/home.ts                        |  3 +++
 js/src/graphql/participant.ts                 |  3 +++
 js/src/graphql/search.ts                      |  2 ++
 8 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/js/src/components/Event/EventMinimalistCard.vue b/js/src/components/Event/EventMinimalistCard.vue
index 549c63db2..2a120151f 100644
--- a/js/src/components/Event/EventMinimalistCard.vue
+++ b/js/src/components/Event/EventMinimalistCard.vue
@@ -18,6 +18,20 @@
     </div>
     <div class="title-info-wrapper has-text-grey-dark">
       <h3 class="event-minimalist-title" :lang="event.language" dir="auto">
+        <b-tag
+          type="is-info"
+          class="mr-1"
+          v-if="event.status === EventStatus.TENTATIVE"
+        >
+          {{ $t("Tentative") }}
+        </b-tag>
+        <b-tag
+          type="is-danger"
+          class="mr-1"
+          v-if="event.status === EventStatus.CANCELLED"
+        >
+          {{ $t("Cancelled") }}
+        </b-tag>
         <b-tag
           class="mr-2"
           type="is-warning"
@@ -105,7 +119,7 @@
 import { Component, Prop, Vue } from "vue-property-decorator";
 import { IEvent, organizer, organizerDisplayName } from "@/types/event.model";
 import DateCalendarIcon from "@/components/Event/DateCalendarIcon.vue";
-import { ParticipantRole } from "@/types/enums";
+import { EventStatus, ParticipantRole } from "@/types/enums";
 import RouteName from "../../router/name";
 import LazyImageWrapper from "@/components/Image/LazyImageWrapper.vue";
 import InlineAddress from "@/components/Address/InlineAddress.vue";
@@ -129,6 +143,8 @@ export default class EventMinimalistCard extends Vue {
   organizerDisplayName = organizerDisplayName;
 
   organizer = organizer;
+
+  EventStatus = EventStatus;
 }
 </script>
 <style lang="scss" scoped>
diff --git a/js/src/components/Event/EventParticipationCard.vue b/js/src/components/Event/EventParticipationCard.vue
index 2d4309ede..743ae6620 100644
--- a/js/src/components/Event/EventParticipationCard.vue
+++ b/js/src/components/Event/EventParticipationCard.vue
@@ -45,6 +45,22 @@
         </div>
         <div class="list-card-content">
           <div class="title-wrapper" dir="auto">
+            <b-tag
+              type="is-info"
+              class="mr-1 mb-1"
+              size="is-medium"
+              v-if="participation.event.status === EventStatus.TENTATIVE"
+            >
+              {{ $t("Tentative") }}
+            </b-tag>
+            <b-tag
+              type="is-danger"
+              class="mr-1 mb-1"
+              size="is-medium"
+              v-if="participation.event.status === EventStatus.CANCELLED"
+            >
+              {{ $t("Cancelled") }}
+            </b-tag>
             <router-link
               :to="{
                 name: RouteName.EVENT,
@@ -257,7 +273,7 @@ import { Component, Prop } from "vue-property-decorator";
 import DateCalendarIcon from "@/components/Event/DateCalendarIcon.vue";
 import { mixins } from "vue-class-component";
 import { RawLocation, Route } from "vue-router";
-import { EventVisibility, ParticipantRole } from "@/types/enums";
+import { EventStatus, EventVisibility, ParticipantRole } from "@/types/enums";
 import { IParticipant } from "../../types/participant.model";
 import {
   IEventCardOptions,
@@ -326,6 +342,8 @@ export default class EventParticipationCard extends mixins(
 
   RouteName = RouteName;
 
+  EventStatus = EventStatus;
+
   get mergedOptions(): IEventCardOptions {
     return { ...defaultOptions, ...this.options };
   }
diff --git a/js/src/graphql/actor.ts b/js/src/graphql/actor.ts
index 2b8771153..9bbbc3b71 100644
--- a/js/src/graphql/actor.ts
+++ b/js/src/graphql/actor.ts
@@ -41,6 +41,7 @@ export const FETCH_PERSON = gql`
           uuid
           title
           beginsOn
+          status
         }
       }
     }
@@ -84,6 +85,7 @@ export const GET_PERSON = gql`
           uuid
           title
           beginsOn
+          status
         }
       }
       participations(page: $participationPage, limit: $participationLimit) {
@@ -95,6 +97,7 @@ export const GET_PERSON = gql`
             uuid
             title
             beginsOn
+            status
           }
         }
       }
@@ -213,6 +216,7 @@ export const LOGGED_USER_DRAFTS = gql`
           alt
         }
         beginsOn
+        status
         visibility
         attributedTo {
           ...ActorFragment
diff --git a/js/src/graphql/event.ts b/js/src/graphql/event.ts
index cafcbdcb4..155802b43 100644
--- a/js/src/graphql/event.ts
+++ b/js/src/graphql/event.ts
@@ -61,6 +61,7 @@ const FULL_EVENT_FRAGMENT = gql`
       uuid
       title
       beginsOn
+      status
       language
       picture {
         id
@@ -438,6 +439,7 @@ export const FETCH_GROUP_EVENTS = gql`
           uuid
           title
           beginsOn
+          status
           draft
           options {
             ...EventOptions
diff --git a/js/src/graphql/group.ts b/js/src/graphql/group.ts
index fbc085d15..fdc4dac9b 100644
--- a/js/src/graphql/group.ts
+++ b/js/src/graphql/group.ts
@@ -42,6 +42,7 @@ export const LIST_GROUPS = gql`
             id
             uuid
             title
+            status
             beginsOn
           }
           total
@@ -104,6 +105,7 @@ export const GROUP_FIELDS_FRAGMENTS = gql`
         uuid
         title
         beginsOn
+        status
         draft
         language
         options {
diff --git a/js/src/graphql/home.ts b/js/src/graphql/home.ts
index 9fda50247..8d9390aeb 100644
--- a/js/src/graphql/home.ts
+++ b/js/src/graphql/home.ts
@@ -36,6 +36,7 @@ export const HOME_USER_QUERIES = gql`
               alt
             }
             beginsOn
+            status
             visibility
             language
             organizerActor {
@@ -77,6 +78,7 @@ export const HOME_USER_QUERIES = gql`
             uuid
             title
             beginsOn
+            status
             picture {
               url
             }
@@ -127,6 +129,7 @@ export const CLOSE_CONTENT = gql`
         title
         uuid
         beginsOn
+        status
         picture {
           id
           url
diff --git a/js/src/graphql/participant.ts b/js/src/graphql/participant.ts
index b3772833e..571d3850f 100644
--- a/js/src/graphql/participant.ts
+++ b/js/src/graphql/participant.ts
@@ -32,6 +32,7 @@ export const LOGGED_USER_PARTICIPATIONS = gql`
               alt
             }
             beginsOn
+            status
             visibility
             organizerActor {
               ...ActorFragment
@@ -98,6 +99,7 @@ export const LOGGED_USER_UPCOMING_EVENTS = gql`
               alt
             }
             beginsOn
+            status
             visibility
             organizerActor {
               ...ActorFragment
@@ -144,6 +146,7 @@ export const LOGGED_USER_UPCOMING_EVENTS = gql`
             uuid
             title
             beginsOn
+            status
             picture {
               url
             }
diff --git a/js/src/graphql/search.ts b/js/src/graphql/search.ts
index c0124840a..9f4462d3e 100644
--- a/js/src/graphql/search.ts
+++ b/js/src/graphql/search.ts
@@ -38,6 +38,7 @@ export const SEARCH_EVENTS_AND_GROUPS = gql`
           id
           url
         }
+        status
         tags {
           ...TagFragment
         }
@@ -108,6 +109,7 @@ export const INTERACT = gql`
         title
         uuid
         beginsOn
+        status
         picture {
           id
           url