Skip to content

Commit ede6629

Browse files
committed
fix: change position to Subscription card
1 parent 8ff8c41 commit ede6629

File tree

1 file changed

+50
-50
lines changed

1 file changed

+50
-50
lines changed

core/ui/src/views/ClusterStatus.vue

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -63,55 +63,6 @@
6363
</div>
6464
</template>
6565
</NsInfoCard>
66-
<NsInfoCard
67-
light
68-
:title="$t('cluster_status.subscription_status')"
69-
:icon="Badge32"
70-
:loading="loading.getSubscription"
71-
:isErrorShown="error.getSubscription"
72-
:errorTitle="$t('error.cannot_retrieve_subscription_status')"
73-
:errorDescription="error.getSubscription"
74-
class="min-height-card"
75-
>
76-
<template slot="content">
77-
<div class="card-rows">
78-
<div class="card-row">
79-
<div v-if="!loading.getSubscription" class="card-row">
80-
<cv-tag
81-
v-if="subscription_status === 'active'"
82-
kind="green"
83-
:label="$t('common.active')"
84-
></cv-tag>
85-
<cv-tag
86-
v-else
87-
kind="high-contrast"
88-
:label="$t('common.not_active')"
89-
></cv-tag>
90-
</div>
91-
</div>
92-
<div
93-
v-if="support_active && !loading.getSubscription"
94-
class="card-row"
95-
>
96-
<div class="mg-top-sm icon-and-text">
97-
<NsSvg :svg="InformationFilled16" class="icon ns-info" />
98-
<span>{{
99-
$t("settings_subscription.remote_support_in_progress")
100-
}}</span>
101-
</div>
102-
</div>
103-
<div v-if="!loading.getSubscription" class="card-row">
104-
<NsButton
105-
kind="ghost"
106-
:icon="ArrowRight20"
107-
@click="$router.push('/settings/subscription')"
108-
>
109-
{{ $t("cluster_status.go_to_subscription") }}
110-
</NsButton>
111-
</div>
112-
</div>
113-
</template>
114-
</NsInfoCard>
11566
<NsInfoCard
11667
light
11768
:title="installedModules.length.toString()"
@@ -385,6 +336,55 @@
385336
</div>
386337
</template>
387338
</NsInfoCard>
339+
<NsInfoCard
340+
light
341+
:title="$t('cluster_status.subscription_status')"
342+
:icon="Badge32"
343+
:loading="loading.getSubscription"
344+
:isErrorShown="error.getSubscription"
345+
:errorTitle="$t('error.cannot_retrieve_subscription_status')"
346+
:errorDescription="error.getSubscription"
347+
class="min-height-card"
348+
>
349+
<template slot="content">
350+
<div class="card-rows">
351+
<div class="card-row">
352+
<div v-if="!loading.getSubscription" class="card-row">
353+
<cv-tag
354+
v-if="subscription_status === 'active'"
355+
kind="green"
356+
:label="$t('common.active')"
357+
></cv-tag>
358+
<cv-tag
359+
v-else
360+
kind="high-contrast"
361+
:label="$t('common.not_active')"
362+
></cv-tag>
363+
</div>
364+
</div>
365+
<div
366+
v-if="support_active && !loading.getSubscription"
367+
class="card-row"
368+
>
369+
<div class="mg-top-sm icon-and-text">
370+
<NsSvg :svg="InformationFilled16" class="icon ns-info" />
371+
<span>{{
372+
$t("settings_subscription.remote_support_in_progress")
373+
}}</span>
374+
</div>
375+
</div>
376+
<div v-if="!loading.getSubscription" class="card-row">
377+
<NsButton
378+
kind="ghost"
379+
:icon="ArrowRight20"
380+
@click="$router.push('/settings/subscription')"
381+
>
382+
{{ $t("cluster_status.go_to_subscription") }}
383+
</NsButton>
384+
</div>
385+
</div>
386+
</template>
387+
</NsInfoCard>
388388
</div>
389389
</cv-column>
390390
</cv-row>
@@ -757,7 +757,7 @@ export default {
757757
this.loading.getClusterStatus = false;
758758
},
759759
async listModules() {
760-
this.loading.modules = true;
760+
this.loading.listModules = true;
761761
this.error.listModules = "";
762762
const taskAction = "list-modules";
763763
const eventId = this.getUuid();

0 commit comments

Comments
 (0)