- Corrections for setting up the test environment

- Correction of some bugs discovered

eveai_app/templates/navbar.html

@@ -78,11 +78,18 @@
                                 ]) }}
                             {% endif %}
                             {% if current_user.is_authenticated %}
-                                {{ dropdown('Partners', 'partner_exchange', [
+                                {% set partner_menu_items = [
                                     {'name': 'Partners', 'url': '/partner/partners', 'roles': ['Super User']},
-                                    {'name': 'Partner Services', 'url': '/partner/partner_services', 'roles': ['Super User']},
-                                    {'name': 'Edit Partner', 'url': '/partner/partner/' ~ session['partner'].get('id'), 'roles': ['Super User', 'Partner Admin']},
-                                ]) }}
+                                    {'name': 'Partner Services', 'url': '/partner/partner_services', 'roles': ['Super User']}
+                                ] %}
+
+                                {% if 'partner' in session and session['partner'] %}
+                                    {% set partner_menu_items = partner_menu_items + [
+                                        {'name': 'Edit Partner', 'url': '/partner/partner/' ~ session['partner'].get('id'), 'roles': ['Super User', 'Partner Admin']}
+                                    ] %}
+                                {% endif %}
+
+                                {{ dropdown('Partners', 'partner_exchange', partner_menu_items) }}
                             {% endif %}
                             {% if current_user.is_authenticated %}
                                 {{ dropdown('Documents', 'note_stack', [

eveai_app/views/user_views.py

@@ -3,7 +3,7 @@ from datetime import datetime as dt, timezone as tz
 from flask import request, redirect, flash, render_template, Blueprint, session, current_app
 from flask_mailman import EmailMessage
 from flask_security import roles_accepted, current_user
-from sqlalchemy.exc import SQLAlchemyError
+from sqlalchemy.exc import SQLAlchemyError, IntegrityError
 import ast
 
 from common.models.user import User, Tenant, Role, TenantDomain, TenantProject, PartnerTenant
@@ -38,8 +38,8 @@ def log_after_request(response):
 @user_bp.route('/tenant', methods=['GET', 'POST'])
 @roles_accepted('Super User', 'Partner Admin')
 def tenant():
-    if not current_user.has_roles('Partner Admin') and UserServices.can_user_create_tenant():
-        current_app.logger.error(f'User {current_user.email} cannot create tenant in the current user')
+    if not UserServices.can_user_create_tenant():
+        current_app.logger.error(f'User {current_user.email} cannot create tenant')
         flash(f"You don't have the appropriate permissions to create a tenant", 'danger')
         return redirect(prefixed_url_for('user_bp.select_tenant'))
     form = TenantForm()
@@ -68,6 +68,17 @@ def tenant():
                 # Super User chose to associate with partner
                 TenantServices.associate_tenant_with_partner(new_tenant.id)
 
+        except IntegrityError as e:
+            db.session.rollback()
+            # Check for the specific error about duplicate tenant name
+            if "tenant_name_key" in str(e) or "duplicate key value" in str(e):
+                flash(f"A tenant with the name '{form.name.data}' already exists. Please choose a different name.",
+                      'danger')
+            else:
+                current_app.logger.error(f'Failed to add tenant to database. Error: {str(e)}')
+                flash(f'Failed to add tenant to database. Error: {str(e)}', 'danger')
+            return render_template('user/tenant.html', form=form)
+
         except SQLAlchemyError as e:
             current_app.logger.error(f'Failed to add tenant to database. Error: {str(e)}')
             flash(f'Failed to add tenant to database. Error: {str(e)}', 'danger')
@@ -227,8 +238,12 @@ def select_tenant():
     # Start with a base query
     query = Tenant.query
 
+    current_app.logger.debug("We proberen het scherm op te bouwen")
+    current_app.logger.debug(f"Session: {session}")
+
     # Apply different filters based on user role
     if current_user.has_roles('Partner Admin') and 'partner' in session:
+        current_app.logger.debug("We zitten in partner mode")
         # Get the partner's management service
         management_service = next((service for service in session['partner']['services']
                                    if service.get('type') == 'MANAGEMENT_SERVICE'), None)
@@ -251,6 +266,7 @@ def select_tenant():
             # Filter query to only show allowed tenants
             query = query.filter(Tenant.id.in_(allowed_tenant_ids))
 
+    current_app.logger.debug("We zitten na partner service selectie")
     # Apply form filters (for both Super User and Partner Admin)
     if filter_form.validate_on_submit():
         if filter_form.types.data: