-
Notifications
You must be signed in to change notification settings - Fork 33
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implemented: Updated the DataManager Logs page to be dynamic in Job Manager(#680) #729
Changes from 5 commits
6700d52
c20f911
ab25739
edd8a39
f3b879b
a6863d9
37a38e4
80bf970
7cd2050
3f2f3f6
89b8b4a
2c9dd31
0e6ba95
8047986
08be04e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
<template> | ||
<ion-content> | ||
<ion-list> | ||
<ion-list-header>{{ translate('Log Id') }}</ion-list-header> | ||
<ion-item button @click="downloadLogFile('logFile')"> | ||
{{ translate('Log file') }} | ||
</ion-item> | ||
<ion-item button :lines="log?.errorRecordContentId ? undefined : 'none'" @click="downloadLogFile('uploadedFle')"> | ||
R-Sourabh marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think we should show error item disabled instead of hiding, if there is not error content. |
||
{{ translate('Uploaded file') }} | ||
</ion-item> | ||
<ion-item v-if="log?.errorRecordContentId" button lines="none" @click="downloadLogFile('failedRecords')"> | ||
{{ translate('Failed records') }} | ||
</ion-item> | ||
</ion-list> | ||
</ion-content> | ||
</template> | ||
|
||
<script lang="ts"> | ||
import { | ||
IonContent, | ||
IonItem, | ||
IonList, | ||
IonListHeader, | ||
popoverController | ||
} from "@ionic/vue"; | ||
import { mapGetters } from 'vuex'; | ||
import { defineComponent } from "vue"; | ||
import { translate } from "@hotwax/dxp-components"; | ||
import { JobService } from "@/services/JobService"; | ||
import { responseFileType, showToast } from '@/utils'; | ||
import logger from "@/logger"; | ||
|
||
export default defineComponent({ | ||
name: "DownloadLogsFilePopover", | ||
components: { | ||
IonContent, | ||
IonItem, | ||
IonList, | ||
IonListHeader | ||
}, | ||
computed: { | ||
...mapGetters({ | ||
getDataResourceId: 'job/getDataResourceIds', | ||
}), | ||
}, | ||
props: ["log"], | ||
R-Sourabh marked this conversation as resolved.
Show resolved
Hide resolved
|
||
methods: { | ||
async downloadLogFile(type: any) { | ||
let contentIdType; | ||
let dataResource = {} as any; | ||
|
||
if (type === 'logFile') { | ||
contentIdType = 'logFileContentId'; | ||
R-Sourabh marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} else if (type === 'failedRecords') { | ||
contentIdType = 'errorRecordContentId'; | ||
} else if (type === 'uploadedFle') { | ||
R-Sourabh marked this conversation as resolved.
Show resolved
Hide resolved
|
||
dataResource.dataResourceId = this.log.dataResourceId; | ||
dataResource.name = this.log.contentName | ||
} | ||
|
||
if (contentIdType) { | ||
dataResource = this.getDataResourceId(this.log[contentIdType]); | ||
} | ||
|
||
if (dataResource) { | ||
try { | ||
const response = await JobService.downloadCsv({ | ||
R-Sourabh marked this conversation as resolved.
Show resolved
Hide resolved
|
||
dataResourceId: dataResource.dataResourceId | ||
}); | ||
responseFileType(response.data, dataResource.name); | ||
} catch (error) { | ||
showToast(translate('Error downloading file')) | ||
logger.error(error) | ||
} | ||
} | ||
popoverController.dismiss(); | ||
} | ||
}, | ||
setup() { | ||
return { | ||
translate | ||
} | ||
} | ||
}); | ||
</script> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,281 @@ | ||
<template> | ||
R-Sourabh marked this conversation as resolved.
Show resolved
Hide resolved
|
||
<ion-page> | ||
<ion-header> | ||
<ion-toolbar> | ||
<ion-back-button slot="start" default-href="/pipeline" /> | ||
<ion-title>{{ translate("Import logs")}}</ion-title> | ||
</ion-toolbar> | ||
</ion-header> | ||
|
||
<ion-content> | ||
<div class="header"> | ||
<div class="ion-padding"> | ||
<section> | ||
<ion-item lines="none"> | ||
<h1>{{ translate('Import logs') }}</h1> | ||
</ion-item> | ||
<ion-list> | ||
<ion-item> | ||
<ion-icon slot="start" :icon="pulseOutline" /> | ||
{{ translate('Job') }} | ||
<ion-label slot="end" class="ion-text-wrap">{{ currentJob.jobId }}</ion-label> | ||
</ion-item> | ||
<ion-item> | ||
<ion-icon slot="start" :icon="fileTrayFullOutline" /> | ||
{{ translate('Files received') }} | ||
<ion-label slot="end">{{ getDataLogs.length }}</ion-label> | ||
</ion-item> | ||
<ion-item> | ||
<ion-icon slot="start" :icon="codeWorkingOutline" /> | ||
{{ translate('Files processed') }} | ||
<ion-label slot="end">{{ getProcessedFileCount() }}</ion-label> | ||
</ion-item> | ||
<ion-item lines="none"> | ||
<ion-icon slot="start" :icon="warningOutline" /> | ||
{{ translate('Files with errors') }} | ||
<ion-label slot="end">{{ getErrorFileCount() }}</ion-label> | ||
</ion-item> | ||
</ion-list> | ||
</section> | ||
</div> | ||
<div class="config ion-padding"> | ||
<ion-label lines="none"> | ||
<p class="overline">{{ currentJob.runtimeData?.configId }}</p> | ||
<h1>{{ configDetails?.description }}</h1> | ||
</ion-label> | ||
<ion-list> | ||
<ion-item> | ||
<ion-icon slot="start" :icon="shareSocialOutline" /> | ||
{{ translate('Multithreading') }} | ||
<ion-label slot="end">{{ currentJob.runtimeData?.groupBy ? currentJob.runtimeData?.groupBy : "-" }}</ion-label> | ||
</ion-item> | ||
<ion-item> | ||
<ion-icon slot="start" :icon="globeOutline" /> | ||
{{ translate('SFTP') }} | ||
<ion-label class="ion-text-wrap" slot="end">{{ configDetails?.importPath }}</ion-label> | ||
</ion-item> | ||
<ion-item> | ||
<ion-icon slot="start" :icon="optionsOutline" /> | ||
{{ translate('Mode') }} | ||
<ion-label slot="end">{{ configDetails?.executionModeId ? configDetails?.executionModeId : "-"}}</ion-label> | ||
</ion-item> | ||
</ion-list> | ||
</div> | ||
</div> | ||
|
||
<div class="ion-padding"> | ||
<ion-chip v-for="(chip, index) in chips" :key="index" outline @click="updateLogs(chip.label)"> | ||
R-Sourabh marked this conversation as resolved.
Show resolved
Hide resolved
R-Sourabh marked this conversation as resolved.
Show resolved
Hide resolved
|
||
<ion-label>{{ chip.label }}</ion-label> | ||
<ion-icon v-if="selectedChip === chip.label" :icon="checkmarkOutline" /> | ||
</ion-chip> | ||
</div> | ||
|
||
<div class="empty-state" v-if="isLoading"> | ||
<ion-spinner name="crescent" /> | ||
</div> | ||
<div v-else-if="filteredLogs?.length" > | ||
<div class="list-item" v-for="(log, index) in filteredLogs" :key="index"> | ||
<ion-item lines="none"> | ||
<ion-icon slot="start" :icon="documentTextOutline" /> | ||
<ion-label> | ||
<p class="overline">{{ log.logId }}</p> | ||
{{ log.contentName }} | ||
<p>{{ getDateTime(log.createdDate) }}</p> | ||
</ion-label> | ||
</ion-item> | ||
|
||
<ion-label> | ||
{{ getDateTime(log.startDateTime) }} | ||
<p>{{ translate('Started') }}</p> | ||
</ion-label> | ||
|
||
<ion-label> | ||
{{ getDateTime(log.finishDateTime) }} | ||
<p>{{ translate('Finished') }}</p> | ||
</ion-label> | ||
|
||
<ion-badge color="success" v-if="log.statusId === 'SERVICE_FINISHED'">{{ translate('Finished') }}</ion-badge> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Display the status description here. You need to fetch the status data for statusTypeId='SERVICE_STATUS' and then create uiLables for all the statuses. |
||
<ion-badge color="danger" v-if="log.statusId === 'SERVICE_FAILED'">{{ translate('Failed') }}</ion-badge> | ||
<ion-badge color="success" v-if="log.statusId === 'SERVICE_RUNNING' || log.statusId === 'SERVICE_QUEUED'">{{ translate('Running') }}</ion-badge> | ||
|
||
<div class="ion-text-center" lines="none" v-if="log.errorRecordContentId" button @click="downloadCsv(log?.errorRecordContentId)"> | ||
<ion-icon slot="start" :icon="cloudDownloadOutline" /> | ||
<ion-label> | ||
<p>{{ translate('Failed records') }}</p> | ||
</ion-label> | ||
</div> | ||
<div v-else></div> | ||
|
||
<ion-button fill="clear" color="medium" @click="openDownloadLogsFilePopover(log, $event)"> | ||
<ion-icon slot="icon-only" :icon="ellipsisVerticalOutline" /> | ||
</ion-button> | ||
</div> | ||
</div> | ||
<div v-else class="empty-state"> | ||
{{ translate('No logs found') }} | ||
</div> | ||
</ion-content> | ||
</ion-page> | ||
</template> | ||
|
||
<script> | ||
import { checkmarkOutline, codeWorkingOutline, cloudDownloadOutline, documentTextOutline, ellipsisVerticalOutline, fileTrayFullOutline, globeOutline, optionsOutline, pulseOutline, shareSocialOutline, warningOutline } from "ionicons/icons"; | ||
import { IonBackButton, IonBadge, IonButton, IonChip, IonContent, IonHeader, IonIcon, IonItem, IonLabel, IonList, IonPage, IonSpinner, IonTitle, IonToolbar, popoverController } from "@ionic/vue"; | ||
import { defineComponent } from 'vue' | ||
import { mapGetters, useStore } from 'vuex' | ||
import { responseFileType } from '@/utils'; | ||
import { translate } from '@hotwax/dxp-components' | ||
import { DateTime } from 'luxon' | ||
import DownloadLogsFilePopover from "@/components/DownloadLogsFilePopover.vue"; | ||
import { JobService } from "@/services/JobService"; | ||
import logger from '@/logger'; | ||
|
||
export default defineComponent ({ | ||
name: "ImportLogsDetail", | ||
components: { | ||
IonBackButton, | ||
IonBadge, | ||
IonButton, | ||
IonChip, | ||
IonContent, | ||
IonHeader, | ||
IonIcon, | ||
IonItem, | ||
IonLabel, | ||
IonList, | ||
IonPage, | ||
IonSpinner, | ||
IonTitle, | ||
IonToolbar, | ||
}, | ||
data() { | ||
return { | ||
configDetails: {}, | ||
selectedChip: 'All', | ||
chips: [ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should be renamed to logFilters and it should be the array of object, each filter object with key and value. So that when apply filters you can pass the ID. |
||
{ label: 'All' }, | ||
{ label: 'Failed logs' }, | ||
{ label: 'Failed records' } | ||
], | ||
filteredLogs: [], | ||
isLoading: true, | ||
} | ||
}, | ||
computed: { | ||
...mapGetters({ | ||
currentJob: 'job/getCurrentJob', | ||
getDataLogs: 'job/getDataLogs', | ||
getJob: 'job/getJob', | ||
getDataResourceId: 'job/getDataResourceIds' | ||
}), | ||
}, | ||
async mounted() { | ||
await this.fetchJobs(); | ||
const job = await this.getJob(this.$route.params.jobId) | ||
await this.store.dispatch('job/updateCurrentJob', { job }); | ||
this.filteredLogs = await this.store.dispatch('job/fetchDataManagerLogs', job.runtimeData?.configId) | ||
this.configDetails = await this.store.dispatch('job/fetchDataManagerConfig', job.runtimeData?.configId) | ||
this.updateLogs('All'); | ||
this.isLoading = false; | ||
}, | ||
methods : { | ||
updateLogs(label) { | ||
this.selectedChip = label | ||
if (label === 'All') { | ||
this.filteredLogs = this.getDataLogs | ||
} else if (label === 'Failed logs') { | ||
this.filteredLogs = this.getDataLogs.filter(log => log.statusId === 'SERVICE_FAILED') | ||
} else if (label === 'Failed records') { | ||
this.filteredLogs = this.getDataLogs.filter(log => log.errorRecordContentId !== null) | ||
} | ||
}, | ||
getDateTime(time) { | ||
return DateTime.fromMillis(time).toFormat("dd/MM/yyyy H:mm a") | ||
}, | ||
getProcessedFileCount() { | ||
return this.getDataLogs.filter((log) => log.statusId === "SERVICE_FINISHED").length | ||
}, | ||
getErrorFileCount() { | ||
return this.getDataLogs.filter((log) => log.errorRecordContentId !== null).length | ||
}, | ||
async openDownloadLogsFilePopover(log, event) { | ||
const popover = await popoverController.create({ | ||
component: DownloadLogsFilePopover, | ||
showBackdrop: false, | ||
event: event, | ||
componentProps: { log } | ||
}); | ||
return popover.present() | ||
}, | ||
async fetchJobs(){ | ||
await this.store.dispatch("job/fetchJobs", { | ||
"inputFields": this.$route.params.jobId | ||
}); | ||
}, | ||
async downloadCsv(id) { | ||
try { | ||
const dataResource = this.getDataResourceId(id); | ||
if (dataResource) { | ||
const response = await JobService.downloadCsv({ | ||
dataResourceId: dataResource.dataResourceId | ||
}); | ||
responseFileType(response.data, dataResource.name); | ||
} | ||
} catch (error) { | ||
logger.error(error); | ||
} | ||
} | ||
}, | ||
setup() { | ||
const store = useStore(); | ||
|
||
return { | ||
checkmarkOutline, | ||
codeWorkingOutline, | ||
cloudDownloadOutline, | ||
documentTextOutline, | ||
ellipsisVerticalOutline, | ||
fileTrayFullOutline, | ||
globeOutline, | ||
optionsOutline, | ||
pulseOutline, | ||
shareSocialOutline, | ||
warningOutline, | ||
translate, | ||
store | ||
} | ||
} | ||
}) | ||
</script> | ||
|
||
<style scoped> | ||
section { | ||
overflow: hidden; | ||
border: var(--border-medium); | ||
border-radius: 16px; | ||
} | ||
|
||
.list-item { | ||
--columns-desktop: 6; | ||
border-bottom : 1px solid var(--ion-color-medium); | ||
} | ||
|
||
.list-item > ion-item { | ||
width: 100%; | ||
} | ||
|
||
.header { | ||
display: grid; | ||
grid-template-columns: repeat(2, 1fr); | ||
} | ||
|
||
.config { | ||
align-self: end; | ||
} | ||
|
||
@media (max-width: 991px) { | ||
.header { | ||
grid-template-columns: 1fr; | ||
} | ||
} | ||
</style> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will the data manager log ID not the text "Log Id".