From 065dd544785e9f260c00be22c2918e480dcb7bb9 Mon Sep 17 00:00:00 2001
From: survellow <59056368+survellow@users.noreply.github.com.>
Date: Tue, 7 Nov 2023 23:23:09 +0100
Subject: [PATCH] 48 fix missing names in calendar module editor

---
 frontend/src/components/RenameModules.vue            |  7 ++++++-
 frontend/src/components/editCalendar/EditModules.vue | 10 +++++++++-
 frontend/src/helpers/strings.ts                      |  8 ++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 frontend/src/helpers/strings.ts

diff --git a/frontend/src/components/RenameModules.vue b/frontend/src/components/RenameModules.vue
index 3350100..8a6e620 100644
--- a/frontend/src/components/RenameModules.vue
+++ b/frontend/src/components/RenameModules.vue
@@ -5,6 +5,7 @@ import router from "../router";
 import tokenStore from "../store/tokenStore.ts";
 import { ref } from "vue";
 import ModuleTemplateDialog from "./ModuleTemplateDialog.vue";
+import { onlyWhitespace } from "../helpers/strings.ts";
 
 const tableData = ref(
   moduleStore().modules.map((module) => {
@@ -68,7 +69,11 @@ async function finalStep() {
           <!-- Text Body -->
           <template #body="{ data, field }">
             <template v-if="field === 'Module'">
-              {{ data[field].userDefinedName }}
+              {{
+                onlyWhitespace(data[field].userDefinedName) ?
+                  data[field].name :
+                  data[field].userDefinedName
+              }}
             </template>
             <template v-else-if="field === 'Reminder'">
               <Button
diff --git a/frontend/src/components/editCalendar/EditModules.vue b/frontend/src/components/editCalendar/EditModules.vue
index a767e51..e552342 100644
--- a/frontend/src/components/editCalendar/EditModules.vue
+++ b/frontend/src/components/editCalendar/EditModules.vue
@@ -7,6 +7,7 @@ import { saveIndividualFeed } from "../../api/createFeed";
 import tokenStore from "../../store/tokenStore";
 import router from "../../router";
 import ModuleTemplateDialog from "../ModuleTemplateDialog.vue";
+import { onlyWhitespace } from "../../helpers/strings.ts";
 
 const tableData = computed(() =>
   moduleStore().modules.map((module: Module) => {
@@ -89,7 +90,11 @@ async function finalStep() {
           <!-- Text Body -->
           <template #body="{ data, field }">
             <template v-if="field === 'Module'">
-              {{ data[field].userDefinedName }}
+              {{ 
+                onlyWhitespace(data[field].userDefinedName) ?
+                  data[field].name :
+                  data[field].userDefinedName 
+              }}
             </template>
             <template v-else-if="field === 'Reminder'">
               <Button
@@ -124,6 +129,9 @@ async function finalStep() {
                 @click="data.Module.reminder = !data.Module.reminder"
               ></Button>
             </template>
+            <template v-else>
+              {{ data[field] }}
+            </template>
           </template>
         </Column>
         <Column>
diff --git a/frontend/src/helpers/strings.ts b/frontend/src/helpers/strings.ts
new file mode 100644
index 0000000..15ac4c8
--- /dev/null
+++ b/frontend/src/helpers/strings.ts
@@ -0,0 +1,8 @@
+/**
+ * Returns false only if the input argument is a string which contains characters that are not considered a whitespace
+ * @param str - The string to check for whitespace
+ * @returns boolean - true if the string contains only whitespace, false otherwise
+ */
+export function onlyWhitespace(str: string): boolean {
+  return !str || str.length === 0 || /^\s*$/.test(str);
+}