Skip to content

Commit dcac929

Browse files
authored
Merge pull request #3259 from hilalozturk1/SER-154
[SER-154] shown the incoming data in the table on the Import tab
2 parents 49432f8 + b9859ae commit dcac929

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

plugins/data_migration/frontend/public/javascripts/countly.views.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,12 @@
2323
countlyDataMigration.loadImportList()
2424
.then(function(res) {
2525
if (typeof res.result === "object") {
26-
self.list = res.result;
26+
var finalArr = [];
27+
for (var key in res.result) {
28+
var element = res.result[key];
29+
finalArr.push(element);
30+
}
31+
self.list = finalArr;
2732
}
2833
else if (typeof res.result === "string") {
2934
self.list = [];

plugins/data_migration/frontend/public/templates/imports-tab.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div>
22
<cly-datatable-n class="bu-mx-5" :rows="list" :persist-key="importsTablePersistKey">
33
<template v-slot="scope">
4-
<el-table-column sortable="true" prop="app_names" :label="i18n('data-migration.applications')">
4+
<el-table-column sortable="true" prop="app_list" :label="i18n('data-migration.applications')">
55
<template v-slot="rowScope">
66
<span class="text-medium">
77
<div>
@@ -14,7 +14,7 @@
1414
</span>
1515
</template>
1616
</el-table-column>
17-
<el-table-column sortable="true" prop="step" :label="i18n('data-migration.table.step')">
17+
<el-table-column sortable="true" prop="status_text" :label="i18n('data-migration.table.step')">
1818
<template v-slot="rowScope">
1919
<div class="bu-py-6">
2020
<span class="text-medium">
@@ -23,7 +23,7 @@
2323
</div>
2424
</template>
2525
</el-table-column>
26-
<el-table-column sortable="true" prop="created" :label="i18n('data-migration.table.last-update')">
26+
<el-table-column sortable="true" prop="last_update" :label="i18n('data-migration.table.last-update')">
2727
<template v-slot="rowScope">
2828
<span class="text-medium">
2929
{{ rowScope.row.last_update }}

0 commit comments

Comments
 (0)