- Create framework for chat-client, including logo, explanatory text, color settings, ...

- remove allowed_langages from tenant
- Correct bugs in Tenant, TenantMake, SpecialistMagicLink
- Change chat client customisation elements

eveai_app/views/basic_forms.py

@@ -1,4 +1,4 @@
-from flask import session
+from flask import session, current_app
 from flask_security import current_user
 from flask_wtf import FlaskForm
 from wtforms import StringField, SelectField
@@ -36,7 +36,7 @@ class SessionDefaultsForm(FlaskForm):
         else:
             self.partner_name.data = ""
         self.default_language.choices = [(lang, lang.lower()) for lang in
-                                         session.get('tenant').get('allowed_languages')]
+                                         current_app.config['SUPPORTED_LANGUAGES']]
         self.default_language.data = session.get('default_language')
 
         # Get a new session for catalog queries

eveai_app/views/document_forms.py

@@ -190,7 +190,7 @@ class AddDocumentForm(DynamicFormBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.language.choices = [(language, language) for language in
-                                 session.get('tenant').get('allowed_languages')]
+                                 current_app.config['SUPPORTED_LANGUAGES']]
         if not self.language.data:
             self.language.data = session.get('tenant').get('default_language')
 
@@ -210,7 +210,7 @@ class AddURLForm(DynamicFormBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.language.choices = [(language, language) for language in
-                                 session.get('tenant').get('allowed_languages')]
+                                 current_app.config['SUPPORTED_LANGUAGES']]
         if not self.language.data:
             self.language.data = session.get('tenant').get('default_language')
 

eveai_app/views/interaction_forms.py

@@ -182,11 +182,6 @@ class EditSpecialistMagicLinkForm(DynamicFormBase):
         tenant_makes = TenantMake.query.all()
         self.tenant_make_id.choices = [(0, 'None')] + [(make.id, make.name) for make in tenant_makes]
 
-        # If the form has a tenant_make_id that's not zero, set the tenant_make_name
-        if hasattr(self, 'tenant_make_id') and self.tenant_make_id.data and self.tenant_make_id.data > 0:
-            tenant_make = TenantMake.query.get(self.tenant_make_id.data)
-            if tenant_make:
-                self.tenant_make_name.data = tenant_make.name
 
 
 

eveai_app/views/interaction_views.py

@@ -694,10 +694,6 @@ def specialist_magic_link():
             # Populate fields individually instead of using populate_obj
             form.populate_obj(new_specialist_magic_link)
 
-            # Handle the tenant_make_id special case (0 = None)
-            if form.tenant_make_id.data == 0:
-                new_specialist_magic_link.tenant_make_id = None
-
             set_logging_information(new_specialist_magic_link, dt.now(tz.utc))
 
             # Create 'public' SpecialistMagicLinkTenant
@@ -706,7 +702,7 @@ def specialist_magic_link():
             new_spec_ml_tenant.tenant_id = tenant_id
 
             # Define the make valid for this magic link
-            make_id = SpecialistServices.get_specialist_system_field(new_specialist_magic_link.id,
+            make_id = SpecialistServices.get_specialist_system_field(new_specialist_magic_link.specialist_id,
                                                                      "make", "tenant_make")
             if make_id:
                 new_spec_ml_tenant.tenant_make_id = make_id

eveai_app/views/user_forms.py

@@ -177,13 +177,17 @@ class EditTenantProjectForm(FlaskForm):
 
 
 def validate_make_name(form, field):
-    # Controleer of een TenantMake met deze naam al bestaat
+    # Check if tenant_make already exists in the database
     existing_make = TenantMake.query.filter_by(name=field.data).first()
 
-    # Als er een bestaande make is gevonden en we zijn niet in edit mode,
-    # of als we wel in edit mode zijn maar het is een ander record (andere id)
-    if existing_make and (not hasattr(form, 'id') or form.id.data != existing_make.id):
-        raise ValidationError(f'A Make with name "{field.data}" already exists. Choose another name.')
+    if existing_make:
+        current_app.logger.debug(f'Existing make: {existing_make.id}')
+    current_app.logger.debug(f'Form has id: {hasattr(form, 'id')}')
+    if hasattr(form, 'id'):
+        current_app.logger.debug(f'Form has id: {form.id.data}')
+    if existing_make:
+        if not hasattr(form, 'id') or form.id.data != existing_make.id:
+            raise ValidationError(f'A Make with name "{field.data}" already exists. Choose another name.')
 
 
 class TenantMakeForm(DynamicFormBase):

eveai_app/views/user_views.py

@@ -12,7 +12,7 @@ from common.utils.dynamic_field_utils import create_default_config_from_type_con
 from common.utils.security_utils import send_confirmation_email, send_reset_email
 from config.type_defs.service_types import SERVICE_TYPES
 from .user_forms import TenantForm, CreateUserForm, EditUserForm, TenantDomainForm, TenantSelectionForm, \
-    TenantProjectForm, EditTenantProjectForm, TenantMakeForm, EditTenantForm
+    TenantProjectForm, EditTenantProjectForm, TenantMakeForm, EditTenantForm, EditTenantMakeForm
 from common.utils.database import Database
 from common.utils.view_assistants import prepare_table_for_macro, form_validation_failed
 from common.utils.simple_encryption import generate_api_key
@@ -701,7 +701,7 @@ def edit_tenant_make(tenant_make_id):
     tenant_make = TenantMake.query.get_or_404(tenant_make_id)
 
     # Create form instance with the tenant make
-    form = TenantMakeForm(request.form, obj=tenant_make)
+    form = EditTenantMakeForm(request.form, obj=tenant_make)
 
     customisation_config = cache_manager.customisations_config_cache.get_config("CHAT_CLIENT_CUSTOMISATION")
     form.add_dynamic_fields("configuration", customisation_config, tenant_make.chat_customisation_options)
@@ -755,6 +755,8 @@ def handle_tenant_make_selection():
             # Update session data if necessary
             if 'tenant' in session:
                 session['tenant'] = tenant.to_dict()
+                return None
+            return None
         except SQLAlchemyError as e:
             db.session.rollback()
             flash(f'Failed to update default tenant make. Error: {str(e)}', 'danger')
@@ -762,6 +764,9 @@ def handle_tenant_make_selection():
 
             return redirect(prefixed_url_for('user_bp.tenant_makes'))
 
+    return None
+
+
 def reset_uniquifier(user):
     security.datastore.set_uniquifier(user)
     db.session.add(user)