Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

UI updates: bug fix for Util camelCaseToSentenceCase function

Rich Turner81a1b925d33e
diff --git a/ui/component/core/src/util.ts b/ui/component/core/src/util.ts
index b34534e6e..b1f15c926 100644
--- a/ui/component/core/src/util.ts
+++ b/ui/component/core/src/util.ts
@@ -270,12 +270,21 @@ export function arrayRemove<T>(arr: T[], item: T) {
}
}
-export function camelCaseToSentenceCase(str: string): string {
+export function camelCaseToSentenceCase(str: string | undefined): string {
+ if (str === undefined) {
+ return "";
+ }
+ let startDone = false;
return str.split(/([A-Z]|\d)/).map((v, i, arr) => {
- // If first block then capitalise 1st letter regardless
- if (!i) return v.charAt(0).toUpperCase() + v.slice(1);
// Skip empty blocks
if (!v) return v;
+
+ // If first block then capitalise 1st letter regardless
+ if (!startDone){
+ startDone = true;
+ return v.charAt(0).toUpperCase() + v.slice(1);
+ }
+
// Underscore substitution
if (v === '_') return " ";
// We have a capital or number