From 08787130b8d011d9a8a356461a4b16b2285368c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= <joze.fortun@gmail.com>
Date: Wed, 11 Sep 2024 13:54:04 +0200
Subject: [PATCH] Prevent creating new fields with dots in their name

---
 client/web/compose/src/components/Admin/Module/FieldRowEdit.vue | 2 +-
 lib/js/src/compose/types/module-field/base.ts                   | 2 +-
 locale/en/corteza-webapp-compose/module.yaml                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/web/compose/src/components/Admin/Module/FieldRowEdit.vue b/client/web/compose/src/components/Admin/Module/FieldRowEdit.vue
index 49a9abb05..706833816 100644
--- a/client/web/compose/src/components/Admin/Module/FieldRowEdit.vue
+++ b/client/web/compose/src/components/Admin/Module/FieldRowEdit.vue
@@ -1,7 +1,6 @@
 <template>
   <tr>
     <td
-      v-b-tooltip.noninteractive.hover
       class="handle align-middle pr-2"
     >
       <font-awesome-icon
@@ -15,6 +14,7 @@
     >
       <b-form-input
         v-model="value.name"
+        v-b-tooltip.noninteractive.hover="{ title: nameState === false ? $t('module:edit.tooltip.name') : '', placement: 'right', container: '#body' }"
         required
         :readonly="hasData"
         :state="nameState"
diff --git a/lib/js/src/compose/types/module-field/base.ts b/lib/js/src/compose/types/module-field/base.ts
index 727e8c580..0b2361f04 100644
--- a/lib/js/src/compose/types/module-field/base.ts
+++ b/lib/js/src/compose/types/module-field/base.ts
@@ -2,7 +2,7 @@ import { merge } from 'lodash'
 import { IsOf } from '../../../guards'
 import { Apply, CortezaID, NoID } from '../../../cast'
 
-export const FieldNameValidator = /^[A-Za-z][0-9A-Za-z_\-.]*[A-Za-z0-9]$/
+export const FieldNameValidator = /^[A-Za-z][0-9A-Za-z_-]*[A-Za-z0-9]$/
 
 const unsortableFieldKinds = ['File', 'Geometry']
 const unsortableSysFields = ['recordID']
diff --git a/locale/en/corteza-webapp-compose/module.yaml b/locale/en/corteza-webapp-compose/module.yaml
index cca1a65bd..1442f3d12 100644
--- a/locale/en/corteza-webapp-compose/module.yaml
+++ b/locale/en/corteza-webapp-compose/module.yaml
@@ -74,7 +74,7 @@ edit:
   systemFields: 'System fields:'
   tooltip:
     attributes: Select if the field can hold multiple values, if it's required field or if contains sensitive data
-    name: Should be at least 2 characters long. Can contain only letters, numbers, underscores and dots. Must end with letter or number
+    name: Should be at least 2 characters long. Can contain only letters, numbers, underscores and dashes. Must end with letter or number.
     private: Sensitive data
     required: Required field
     title: The name displayed in form input / data lists