Merge pull request #6782 from Countly/next-fixes

[data-manager] Remove column keys

Author: widatama

plugins/data-manager/frontend/public/templates/event-detail.html

@@ -127,7 +127,7 @@ <h4>{{i18n('data-manager.event-segmentation')}}</h4>
                         </span>
                     </template>
                 </el-table-column>
-                <el-table-column :label="i18n('data-manager.last-modified')" column-key="auditDate" prop="auditTs" sortable="custom">
+                <el-table-column :label="i18n('data-manager.last-modified')" prop="auditTs" sortable="custom">
                     <template v-slot="rowScope">
                         <div v-if="rowScope.row.audit && rowScope.row.audit.ts && rowScope.row.auditDate">
                             <div>{{rowScope.row.auditDate}}</div>
@@ -161,4 +161,4 @@ <h4>{{i18n('data-manager.event-segmentation')}}</h4>
             </ul>
         </template>
     </cly-confirm-dialog>
-</div>
+</div>

plugins/data-manager/frontend/public/templates/events-default.html

@@ -82,7 +82,7 @@
                     </el-table-column>
 
                     <el-table-column v-else-if="col.value === 'lastModifiedts'"
-                        prop="lastModifiedts" column-key="lastModifiedDate" sortable="custom" min-width="275" :label="i18n('data-manager.last-modified')">
+                        prop="lastModifiedts" sortable="custom" min-width="275" :label="i18n('data-manager.last-modified')">
                         <template v-slot="rowScope">
                             <div v-if="rowScope.row && rowScope.row.lastModifiedts">
                                 <div :data-test-id="'datatable-manage-events-events-last-mod-date-' + rowScope.$index">{{rowScope.row.lastModifiedDate || i18n('data-manager.empty-placeholder') }}</div>