diff --git a/aleksis/core/assets/components/CeleryProgress.vue b/aleksis/core/assets/components/CeleryProgress.vue index 65cb9c6832cc9a33c07cc1da7f3fe93899c22d8a..23e99851b84260fb51fbb846363ce45342558780 100644 --- a/aleksis/core/assets/components/CeleryProgress.vue +++ b/aleksis/core/assets/components/CeleryProgress.vue @@ -21,7 +21,7 @@ v-if="data" v-for="(message, idx) in progress.messages" dense - :type="STYLE_CLASSES[message.level]" + :type="message.tag" transition="slide-x-transition" :key="idx" > @@ -66,21 +66,6 @@ import BackButton from "./BackButton.vue"; import MessageBox from "./MessageBox.vue"; -const STYLE_CLASSES = { - 10: 'info', - 20: 'info', - 25: 'success', - 30: 'warning', - 40: 'error', -}; - -const ICONS = { - 10: 'mdi-information', - 20: 'mdi-information', - 25: 'mdi-check-circle', - 30: 'mdi-alert-outline', - 40: 'mdi-alert-octagon-outline', -}; export default { name: 'CeleryProgress', components: {BackButton, MessageBox}, @@ -95,12 +80,6 @@ export default { pollInterval: 1000, } }, - data() { - return { - STYLE_CLASSES, - ICONS, - }; - }, computed: { progress() { return this.celeryProgressByTaskId; diff --git a/aleksis/core/assets/components/celeryProgress.graphql b/aleksis/core/assets/components/celeryProgress.graphql index 49b03ef82bd13e72248d72a98abf90fe6e7c8f1f..d6e12adbf140ce805043143edc29f7441d65533f 100644 --- a/aleksis/core/assets/components/celeryProgress.graphql +++ b/aleksis/core/assets/components/celeryProgress.graphql @@ -11,6 +11,7 @@ query($taskId: String!){ messages { level message + tag } meta { title diff --git a/aleksis/core/schema.py b/aleksis/core/schema.py index 7fd55123697ee7b92b2822fb94be09526290971e..752e704d0e20857120f5581aef1861555a8dfe4a 100644 --- a/aleksis/core/schema.py +++ b/aleksis/core/schema.py @@ -1,4 +1,5 @@ from django.conf import settings +from django.contrib.messages.constants import DEFAULT_TAGS from django.utils import translation import graphene @@ -61,6 +62,7 @@ class SystemPropertiesType(graphene.ObjectType): class CeleryProgressMessage(ObjectType): message = graphene.String(required=True) level = graphene.Int(required=True) + tag = graphene.String(required=True) def resolve_message(root, info, **kwargs): return root[1] @@ -68,6 +70,9 @@ class CeleryProgressMessage(ObjectType): def resolve_level(root, info, **kwargs): return root[0] + def resolve_tag(root, info, **kwargs): + return DEFAULT_TAGS.get(root[0], "info") + class CeleryProgressAdditionalButtonType(ObjectType): title = graphene.String(required=True)