From 74fdc6a9fb877110b9f92cce8649262e07b21c5e Mon Sep 17 00:00:00 2001 From: Gregory Smith Date: Wed, 1 Mar 2023 12:07:15 -0700 Subject: [PATCH 1/2] fix: handle null template validation messages --- .gitignore | 4 ++++ src/commands/analytics/template/validate.ts | 6 +++--- src/lib/analytics/template/validate.ts | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 65f91ce9..942513b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,9 @@ # -- CLEAN tmp/ + +# tsc will sometimes make these +tsconfig.tsbuildinfo + # use yarn by default, so ignore npm package-lock.json diff --git a/src/commands/analytics/template/validate.ts b/src/commands/analytics/template/validate.ts index 6204edd9..9edd1e37 100644 --- a/src/commands/analytics/template/validate.ts +++ b/src/commands/analytics/template/validate.ts @@ -83,9 +83,9 @@ export default class Validate extends SfdxCommand { this.ux.table( tasks.map(task => { return { - label: task.label, - readinessStatus: task.readinessStatus, - message: task.message + label: task.label || '', + readinessStatus: task.readinessStatus || '', + message: task.message || '' }; }), { diff --git a/src/lib/analytics/template/validate.ts b/src/lib/analytics/template/validate.ts index 100542b0..a40091b4 100644 --- a/src/lib/analytics/template/validate.ts +++ b/src/lib/analytics/template/validate.ts @@ -14,9 +14,9 @@ export type ValidateType = Record & { }; export type Tasks = { - label?: string; - message?: string; - readinessStatus?: string; + label?: string | null; + message?: string | null; + readinessStatus?: string | null; }; export default class TemplateValidate { From f3b82c15a8f9b3b414a98156bc04921b0cb4647f Mon Sep 17 00:00:00 2001 From: Gregory Smith Date: Wed, 1 Mar 2023 12:43:57 -0700 Subject: [PATCH 2/2] fix: handle nulls on lint responses --- src/commands/analytics/template/lint.ts | 6 +++--- src/lib/analytics/template/lint.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/commands/analytics/template/lint.ts b/src/commands/analytics/template/lint.ts index 5357fff2..94df3298 100644 --- a/src/commands/analytics/template/lint.ts +++ b/src/commands/analytics/template/lint.ts @@ -63,9 +63,9 @@ export default class Lint extends SfdxCommand { this.ux.table( tasks.map(task => { return { - label: task.label, - readinessStatus: task.readinessStatus, - message: task.message + label: task.label || '', + readinessStatus: task.readinessStatus || '', + message: task.message || '' }; }), { diff --git a/src/lib/analytics/template/lint.ts b/src/lib/analytics/template/lint.ts index 0447bb5f..449cde93 100644 --- a/src/lib/analytics/template/lint.ts +++ b/src/lib/analytics/template/lint.ts @@ -15,9 +15,9 @@ export type LintType = Record & { }; export type Tasks = { - label?: string; - message?: string; - readinessStatus?: string; + label?: string | null; + message?: string | null; + readinessStatus?: string | null; }; export default class TemplateLint {