Skip to content

Commit df07dcf

Browse files
authored
Merge pull request #2359 from Particular/john/banner
Add conditional messages when not supported
2 parents b053313 + dbc0860 commit df07dcf

File tree

2 files changed

+40
-10
lines changed

2 files changed

+40
-10
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { computed } from "vue";
2+
import { useIsSupported } from "@/composables/serviceSemVer";
3+
import { environment } from "@/composables/serviceServiceControl";
4+
5+
export const minimumSCVersionForAllMessages = "6.6.0";
6+
const isAllMessagesSupported = computed(() => useIsSupported(environment.sc_version, minimumSCVersionForAllMessages));
7+
8+
export default isAllMessagesSupported;

src/Frontend/src/views/AuditView.vue

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,37 @@
22
import { licenseStatus } from "../composables/serviceLicense";
33
import LicenseExpired from "../components/LicenseExpired.vue";
44
import AuditList from "@/components/audit/AuditList.vue";
5+
import isAllMessagesSupported, { minimumSCVersionForAllMessages } from "@/components/audit/isAllMessagesSupported.ts";
6+
import ConditionalRender from "@/components/ConditionalRender.vue";
57
</script>
68

79
<template>
8-
<LicenseExpired />
9-
<template v-if="!licenseStatus.isExpired">
10-
<div class="container">
11-
<div class="row title">
12-
<div class="col-12">
13-
<h1>All Messages</h1>
10+
<ConditionalRender :supported="isAllMessagesSupported">
11+
<template #unsupported>
12+
<div class="not-supported">
13+
<p>
14+
The minimum version of ServiceControl required to enable this feature is
15+
<span> {{ minimumSCVersionForAllMessages }} </span>.
16+
</p>
17+
<div>
18+
<a class="btn btn-default btn-primary" href="https://particular.net/downloads" target="_blank">Update ServiceControl to latest version</a>
1419
</div>
1520
</div>
16-
<div class="row">
17-
<AuditList />
21+
</template>
22+
<LicenseExpired />
23+
<template v-if="!licenseStatus.isExpired">
24+
<div class="container">
25+
<div class="row title">
26+
<div class="col-12">
27+
<h1>All Messages</h1>
28+
</div>
29+
</div>
30+
<div class="row">
31+
<AuditList />
32+
</div>
1833
</div>
19-
</div>
20-
</template>
34+
</template>
35+
</ConditionalRender>
2136
</template>
2237

2338
<style scoped>
@@ -34,4 +49,11 @@ import AuditList from "@/components/audit/AuditList.vue";
3449
flex: 0;
3550
min-height: fit-content;
3651
}
52+
53+
.not-supported {
54+
display: flex;
55+
align-items: center;
56+
justify-content: center;
57+
flex-direction: column;
58+
}
3759
</style>

0 commit comments

Comments
 (0)