Skip to content

Commit 4df97cd

Browse files
authored
Merge pull request #21729 from itisAliRH/btable-to-gtable-cleanup-result-dialog
Migrate CleanupResultDialog from BTable to GTable
2 parents f017677 + ebeda43 commit 4df97cd

1 file changed

Lines changed: 15 additions & 11 deletions

File tree

client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.vue

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
<script setup lang="ts">
2+
import { BAlert, BModal, BSpinner } from "bootstrap-vue";
23
import { computed, ref } from "vue";
34
5+
import type { TableField } from "@/components/Common/GTable.types";
46
import localize from "@/utils/localization";
57
68
import type { CleanupResult } from "./model";
79
810
import Alert from "@/components/Alert.vue";
11+
import GTable from "@/components/Common/GTable.vue";
912
1013
interface CleanupResultDialogProps {
1114
result?: CleanupResult;
@@ -33,7 +36,7 @@ const title = computed<string>(() => {
3336
return message;
3437
});
3538
36-
const errorFields = [
39+
const errorFields: TableField[] = [
3740
{ key: "name", label: localize("Name") },
3841
{ key: "reason", label: localize("Reason") },
3942
];
@@ -48,16 +51,17 @@ defineExpose({
4851
</script>
4952

5053
<template>
51-
<b-modal id="cleanup-result-modal" v-model="showModal" :title="title" title-tag="h2" hide-footer static>
54+
<BModal id="cleanup-result-modal" v-model="showModal" :title="title" title-tag="h2" hide-footer static>
5255
<div class="text-center">
5356
<Alert
5457
variant="info"
5558
message="After the operation, the storage space that will be freed up will only be for the unique items. This means that some items may not free up any storage space because they are duplicates of other items." />
56-
<b-spinner v-if="isLoading" class="mx-auto" data-test-id="loading-spinner" />
57-
<div v-else>
58-
<b-alert v-if="result.hasFailed" show variant="danger" data-test-id="error-alert">
59+
60+
<BSpinner v-if="isLoading" class="mx-auto" data-test-id="loading-spinner" />
61+
<div v-else-if="result">
62+
<BAlert v-if="result.hasFailed" show variant="danger" data-test-id="error-alert">
5963
{{ result.errorMessage }}
60-
</b-alert>
64+
</BAlert>
6165
<h3 v-else-if="result.success" data-test-id="success-info">
6266
You've cleared <b>{{ result.niceTotalFreeBytes }}</b>
6367
</h3>
@@ -66,19 +70,19 @@ defineExpose({
6670
You've successfully cleared <b>{{ result.totalCleaned }}</b> items for a total of
6771
<b>{{ result.niceTotalFreeBytes }}</b> but...
6872
</h3>
69-
<b-alert v-if="result.hasSomeErrors" show variant="warning">
73+
<BAlert v-if="result.hasSomeErrors" show variant="warning">
7074
<h3 class="mb-0">
7175
<b>{{ result.errors.length }}</b> items couldn't be cleared
7276
</h3>
73-
</b-alert>
77+
</BAlert>
7478
</div>
75-
<b-table-lite
79+
80+
<GTable
7681
v-if="result.hasSomeErrors"
7782
:fields="errorFields"
7883
:items="result.errors"
79-
small
8084
data-test-id="errors-table" />
8185
</div>
8286
</div>
83-
</b-modal>
87+
</BModal>
8488
</template>

0 commit comments

Comments
 (0)