Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

show newlines in action res and longer timeout

Browse Source
This commit is contained in:
Matt Hill
2021-03-03 08:54:52 -07:00
committed by Aiden McClelland
parent d9894d4082
commit e69a936fb8
3 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
ui/src/app/pages/apps-routes/app-actions/app-actions.page.ts
View File

@@ -68,27 +68,36 @@ export class AppActionsPage extends Cleanup {
}
private async executeAction(action: ServiceAction) {
const res = await this.loaderService.displayDuringP(
this.apiService.serviceAction(this.appId, action),
)
if (isRpcFailure(res)) {
const successAlert = await this.alertCtrl.create({
header: 'Execution Failed',
message: `Error code ${res.error.code}. ${res.error.message}`,
buttons: ['OK'],
cssClass: 'alert-error-message',
})
return await successAlert.present()
}
if (isRpcSuccess(res)) {
const successAlert = await this.alertCtrl.create({
header: 'Execution Complete',
message: res.result,
buttons: ['OK'],
cssClass: 'alert-success-message',
})
return await successAlert.present()
try {
const res = await this.loaderService.displayDuringP(
this.apiService.serviceAction(this.appId, action),
)
if (isRpcFailure(res)) {
this.presentAlertActionFail(res.error.code, res.error.message)
}
if (isRpcSuccess(res)) {
const successAlert = await this.alertCtrl.create({
header: 'Execution Complete',
message: res.result.split('\n').join('</br ></br />'),
buttons: ['OK'],
cssClass: 'alert-success-message',
})
return await successAlert.present()
}
} catch (e) {
this.presentAlertActionFail(500, e.message)
}
}
private async presentAlertActionFail (code: number, message: string): Promise<void> {
const failureAlert = await this.alertCtrl.create({
header: 'Execution Failed',
message: `Error code ${code}. ${message}`,
buttons: ['OK'],
cssClass: 'alert-error-message',
})
return await failureAlert.present()
}
}