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

switch to warning, general cleaning up tech debt

Browse Source
This commit is contained in:
Matt Hill
2021-08-20 07:51:56 -06:00
committed by Matt Hill
parent b71adb24d3
commit e24051b1f3
17 changed files with 93 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ui/src/app/components/form-object/form-object.component.ts
View File

@@ -117,7 +117,7 @@ export class FormObjectComponent {
}
getWarningText (text: string): IonicSafeString {
return new IonicSafeString(`<ion-text color="warning">${text}</ion-text>`)
if (text) return new IonicSafeString(`<ion-text color="warning">${text}</ion-text>`)
}
handleInputChange (spec: ValueSpec) {
@@ -127,7 +127,7 @@ export class FormObjectComponent {
}
handleBooleanChange (key: string, spec: ValueSpecBoolean) {
if (spec['change-warning']) {
if (spec.warning) {
const current = this.formGroup.get(key).value
const cancelFn = () => this.formGroup.get(key).setValue(!current)
this.presentAlertChangeWarning(key, spec, undefined, cancelFn)
@@ -154,12 +154,12 @@ export class FormObjectComponent {
}
async presentAlertChangeWarning (key: string, spec: ValueSpec, okFn?: Function, cancelFn?: Function) {
if (!spec['change-warning'] || this.warningAck[key]) return okFn ? okFn() : null
if (!spec.warning || this.warningAck[key]) return okFn ? okFn() : null
this.warningAck[key] = true
const buttons = [
{
text: 'Proceed',
text: 'Ok',
handler: () => {
if (okFn) okFn()
},
@@ -178,7 +178,7 @@ export class FormObjectComponent {
const alert = await this.alertCtrl.create({
header: 'Warning',
subHeader: `Editing ${spec.name} has consequences:`,
message: spec['change-warning'],
message: spec.warning,
buttons,
})
await alert.present()